[CHANGE] Combined sock and networking

[CHANGE] Updated docs to reflect change
tayler6000 · Jan 15, 2024 · 84203ee · 84203ee
1 parent ef89a1a
commit 84203ee
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/docs/Networking.rst b/docs/Networking.rst
@@ -25,7 +25,7 @@ pyVoIP.networking.nat.\ **AddressType**
 
 .. _TransportMode:
 
-pyVoIP.sock.transport.\ **TransportMode**
+pyVoIP.networking.transport.\ **TransportMode**
   TransportMode is used by pyVoIP to determine what communication protocol to use. TransportMode has the following properties:
 
     TransportMode.\ **value**
@@ -80,7 +80,7 @@ VoIPSocket
 
 The VoIPSocket class is the phone's main SIP socket. It receives and processes all new dialogs, and all messages if using :ref:`TransportMode<TransportMode>`.UDP.
 
-*class* pyVoIP.sock.sock.\ **VoIPSocket**\ (mode: :ref:`TransportMode<TransportMode>`, bind_ip: str, bind_port: int, sip: :ref:`SIPClient`, cert_file: Optional[str] = None, key_file: Optional[str] = None, key_password: :ref:`KEY_PASSWORD<KEY_PASSWORD>` = None)
+*class* pyVoIP.networking.sock.\ **VoIPSocket**\ (mode: :ref:`TransportMode<TransportMode>`, bind_ip: str, bind_port: int, sip: :ref:`SIPClient`, cert_file: Optional[str] = None, key_file: Optional[str] = None, key_password: :ref:`KEY_PASSWORD<KEY_PASSWORD>` = None)
     The *TransportMode* argument is used to determine what communication protocol to use.
 
     The *bind_ip* argument is the IP address that pyVoIP will bind its sockets to.
@@ -104,7 +104,7 @@ VoIPConnection
 
 The VoIPConnecion class is a wrapper for Python's sockets. Since UDP, TCP, and TLS sockets all have different quarks in Python, this class consolidates everything into one interface. For UDP, VoIPConnection will pull messages from :ref:`VoIPSocket`'s database.
 
-*class* pyVoIP.sock.sock.\ **VoIPConnection**\ (voip_sock: :ref:`VoIPSocket`, conn: Optional[:ref:`SOCKETS<SOCKETS>`, message: :ref:`SIPMessage`)
+*class* pyVoIP.networking.sock.\ **VoIPConnection**\ (voip_sock: :ref:`VoIPSocket`, conn: Optional[:ref:`SOCKETS<SOCKETS>`, message: :ref:`SIPMessage`)
     The *voiop_socket* argument is a :ref:`VoIPSocket` instance reference.
 
     The *conn* argument is the underlying Python socket.

diff --git a/pyVoIP/SIP/client.py b/pyVoIP/SIP/client.py
@@ -4,6 +4,8 @@
 from pyVoIP.credentials import CredentialsManager
 from pyVoIP.helpers import Counter
 from pyVoIP.networking.nat import NAT, AddressType
+from pyVoIP.networking.sock import VoIPSocket
+from pyVoIP.networking.transport import TransportMode
 from pyVoIP.SIP.error import (
     SIPParseError,
     InvalidAccountInfoError,
@@ -14,7 +16,6 @@
     SIPStatus,
     SIPMessageType,
 )
-from pyVoIP.sock.transport import TransportMode
 from pyVoIP.types import KEY_PASSWORD
 from pyVoIP.VoIP.status import PhoneStatus
 import pyVoIP
@@ -26,8 +27,8 @@
 
 if TYPE_CHECKING:
     from pyVoIP import RTP
-    from pyVoIP.sock import VoIPConnection
-    from pyVoIP.VoIP import VoIPPhone
+    from pyVoIP.networking.sock import VoIPConnection
+    from pyVoIP.VoIP.phone import VoIPPhone
 
 
 debug = pyVoIP.debug
@@ -204,7 +205,6 @@ def parse_message(self, message: SIPMessage) -> None:
     def start(self) -> None:
         if self.NSD:
             raise RuntimeError("Attempted to start already started SIPClient")
-        from pyVoIP.sock.sock import VoIPSocket
 
         self.NSD = True
         self.s = VoIPSocket(

diff --git a/pyVoIP/VoIP/call.py b/pyVoIP/VoIP/call.py
@@ -22,7 +22,7 @@
 
 if TYPE_CHECKING:
     from pyVoIP.VoIP.phone import VoIPPhone
-    from pyVoIP.sock.sock import VoIPConnection
+    from pyVoIP.networking.sock import VoIPConnection
 
 
 class CallState(Enum):

diff --git a/pyVoIP/VoIP/phone.py b/pyVoIP/VoIP/phone.py
@@ -2,8 +2,8 @@
 from pyVoIP.credentials import CredentialsManager
 from pyVoIP.SIP.client import SIPClient
 from pyVoIP.SIP.message import SIPMessage, SIPMessageType, SIPStatus
-from pyVoIP.sock.sock import VoIPConnection
-from pyVoIP.sock.transport import TransportMode
+from pyVoIP.networking.sock import VoIPConnection
+from pyVoIP.networking.transport import TransportMode
 from pyVoIP.types import KEY_PASSWORD
 from pyVoIP.VoIP.call import CallState, VoIPCall
 from pyVoIP.VoIP.error import (

diff --git a/pyVoIP/sock/sock.py → pyVoIP/networking/sock.py b/pyVoIP/sock/sock.py → pyVoIP/networking/sock.py
@@ -3,7 +3,7 @@
 from pyVoIP.SIP.message import SIPMessage, SIPMessageType
 from pyVoIP.SIP.error import SIPParseError
 from pyVoIP.networking.nat import NAT, AddressType
-from pyVoIP.sock.transport import TransportMode
+from pyVoIP.networking.transport import TransportMode
 import json
 import math
 import pprint

diff --git a/pyVoIP/sock/transport.py → pyVoIP/networking/transport.py b/pyVoIP/sock/transport.py → pyVoIP/networking/transport.py
diff --git a/pyVoIP/sock/__init__.py b/pyVoIP/sock/__init__.py
diff --git a/tests/test_functionality.py b/tests/test_functionality.py
@@ -1,7 +1,7 @@
 from pyVoIP.credentials import CredentialsManager
 from pyVoIP.VoIP.call import CallState
 from pyVoIP.VoIP.phone import PhoneStatus, VoIPPhone, VoIPPhoneParameter
-from pyVoIP.sock.transport import TransportMode
+from pyVoIP.networking.transport import TransportMode
 import json
 import os
 import pytest