Move all enums and constants into their own module

houdini/handlers/__init__.py

@@ -1,15 +1,11 @@
 import inspect
 import enum
 import itertools
-import importlib
-import sys
-import config
 from types import FunctionType
 
 from houdini.converters import _listener, _ArgumentDeserializer, get_converter, do_conversion, _ConverterContext
-
 from houdini.cooldown import _Cooldown, _CooldownMapping, BucketType
-from houdini import plugins, _AbstractManager
+from houdini import plugins, _AbstractManager, get_package_modules
 
 
 class AuthorityError(Exception):

houdini/handlers/login/__init__.py

@@ -1,8 +1,9 @@
 import config
 
-from houdini import handlers, ClientType
+from houdini import handlers
 from houdini.handlers import XMLPacket
 from houdini.converters import VersionChkConverter
+from houdini.constants import ClientType
 
 from houdini.data.buddy import BuddyList
 

houdini/handlers/login/login.py

@@ -1,10 +1,11 @@
-from houdini import handlers, ClientType
-from houdini.handlers import XMLPacket, login
+from houdini import handlers
+from houdini.handlers import XMLPacket
 from houdini.handlers.login import get_server_presence
 from houdini.converters import Credentials
 from houdini.data.penguin import Penguin
 from houdini.data.moderator import Ban
 from houdini.crypto import Crypto
+from houdini.constants import ClientType
 
 import asyncio
 import bcrypt
@@ -97,6 +98,3 @@ async def handle_login(p, credentials: Credentials):
                         data.email)
     else:
         await p.send_xt('l', data.id, login_key, world_populations, buddy_presence)
-
-handle_version_check = login.handle_version_check
-handle_random_key = login.handle_random_key

houdini/handlers/login/world.py

@@ -1,11 +1,12 @@
 import config
 
-from houdini import handlers, ClientType
+from houdini import handlers
 from houdini.handlers import XMLPacket, login
 from houdini.converters import WorldCredentials, Credentials
 from houdini.data.penguin import Penguin
 from houdini.data.moderator import Ban
 from houdini.crypto import Crypto
+from houdini.constants import ClientType
 
 from datetime import datetime
 

houdini/handlers/play/buddy.py

@@ -4,7 +4,7 @@ from houdini.handlers.play.navigation import handle_join_room
 
 from houdini.data.penguin import Penguin
 from houdini.data.buddy import BuddyList, BuddyRequest
-from houdini import ClientType
+from houdini.constants import ClientType
 
 
 async def update_player_presence(p):

houdini/handlers/play/player.py

@@ -1,6 +1,7 @@
-from houdini import handlers, ClientType
+from houdini import handlers
 from houdini.handlers import XTPacket
 from houdini.data.penguin import Penguin
+from houdini.constants import ClientType
 
 from aiocache import cached
 import random

houdini/handlers/play/toy.py

@@ -1,5 +1,6 @@
-from houdini import handlers, ClientType
+from houdini import handlers
 from houdini.handlers import XTPacket
+from houdini.constants import ClientType
 
 
 @handlers.handler(XTPacket('t', 'at'))