Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove BASE_*_TYPECLASS from flat API, break circular imports of cmdhandler in accounts/objects. Resolve #2330.

Browse source
This commit is contained in:
Griatch 2021-03-07 10:31:16 +01:00
parent 12cbe69c1f
commit cd579fb649
3 changed files with 13 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

15
evennia/__init__.py
View file

@ -101,17 +101,6 @@ CHANNEL_HANDLER = None
GLOBAL_SCRIPTS = None
OPTION_CLASSES = None
# typeclasses
BASE_ACCOUNT_TYPECLASS = None
BASE_OBJECT_TYPECLASS = None
BASE_CHARACTER_TYPECLASS = None
BASE_ROOM_TYPECLASS = None
BASE_EXIT_TYPECLASS = None
BASE_CHANNEL_TYPECLASS = None
BASE_SCRIPT_TYPECLASS = None
BASE_GUEST_TYPECLASS = None
def _create_version():
"""
Helper function for building the version string
@ -165,10 +154,6 @@ def _init():
global EvMenu, EvTable, EvForm, EvMore, EvEditor
global ANSIString
global BASE_ACCOUNT_TYPECLASS, BASE_OBJECT_TYPECLASS, BASE_CHARACTER_TYPECLASS
global BASE_ROOM_TYPECLASS, BASE_EXIT_TYPECLASS, BASE_CHANNEL_TYPECLASS
global BASE_SCRIPT_TYPECLASS, BASE_GUEST_TYPECLASS
# Parent typeclasses
from .accounts.accounts import DefaultAccount
from .accounts.accounts import DefaultGuest