Move SourceRCON implementation into sub-package

rcon/__init__.py

@@ -1,8 +1,6 @@
 """RCON client library."""
 
-from rcon.async_rcon import rcon
+from rcon.source import RequestIdMismatch, WrongPassword, Client, rcon
-from rcon.client import Client
-from rcon.exceptions import RequestIdMismatch, WrongPassword
 
 
 __all__ = ['RequestIdMismatch', 'WrongPassword', 'Client', 'rcon']

rcon/source/__init__.py

@@ -0,0 +1,8 @@
+"""Source RCON implementation."""
+
+from rcon.source.async_rcon import rcon
+from rcon.source.client import Client
+from rcon.source.exceptions import RequestIdMismatch, WrongPassword
+
+
+__all__ = ['RequestIdMismatch', 'WrongPassword', 'Client', 'rcon']

rcon/rconclt.py → rcon/source/rconclt.py

@@ -6,7 +6,7 @@ from pathlib import Path
 
 from rcon.client import Client
 from rcon.config import CONFIG_FILES, LOG_FORMAT, from_args
-from rcon.errorhandler import ErrorHandler
+from rcon.source.errorhandler import ErrorHandler
 
 
 __all__ = ['main']

rcon/rconshell.py → rcon/source/rconshell.py

@@ -6,8 +6,8 @@ from pathlib import Path
 
 from rcon.config import CONFIG_FILES, LOG_FORMAT, from_args
 from rcon.console import PROMPT, rconcmd
-from rcon.errorhandler import ErrorHandler
+from rcon.source.errorhandler import ErrorHandler
-from rcon.readline import CommandHistory
+from rcon.source.readline import CommandHistory
 
 
 __all__ = ['get_args', 'main']

setup.py

@@ -14,9 +14,9 @@ setup(
     extras_require={'GUI':  ['pygobject', 'pygtk']},
     entry_points={
         'console_scripts': [
-            'rcongui = rcon.gui:main',
+            'rcongui = rcon.source.gui:main',
-            'rconclt = rcon.rconclt:main',
+            'rconclt = rcon.source.rconclt:main',
-            'rconshell = rcon.rconshell:main',
+            'rconshell = rcon.source.rconshell:main',
         ],
     },
     url='https://github.com/conqp/rcon',

tests/test_config.py

@@ -6,7 +6,7 @@ from string import printable
 from typing import Iterator, Tuple
 from unittest import TestCase
 
-from rcon.config import Config
+from rcon import Config
 
 
 def random_passwd() -> str:

tests/test_proto.py

@@ -5,7 +5,7 @@ from io import BytesIO
 from random import randint
 from unittest import TestCase
 
-from rcon.proto import LittleEndianSignedInt32, Packet, Type, random_request_id
+from rcon import LittleEndianSignedInt32, Packet, Type, random_request_id
 
 
 class TestRandomRequestId(TestCase):