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

Removed spurious mentions of the various typeclass paths from the server.

Browse source
This commit is contained in:
Griatch 2015-03-15 16:39:44 +01:00
parent e778582dca
commit 3a7ee291ba
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
evennia/commands/default/building.py
View file

@ -2250,7 +2250,7 @@ class CmdScript(MuxCommand):
else: else:
paths = [self.rhs] + ["%s.%s" % (prefix, self.rhs) paths = [self.rhs] + ["%s.%s" % (prefix, self.rhs)
for prefix in settings.SCRIPT_TYPECLASS_PATHS] for prefix in settings.TYPECLASS_PATHS]
if "stop" in self.switches: if "stop" in self.switches:
# we are stopping an already existing script # we are stopping an already existing script
for path in paths: for path in paths:

8
evennia/utils/create.py
View file

@ -80,7 +80,7 @@ def create_object(typeclass=None, key=None, location=None,
if isinstance(typeclass, basestring): if isinstance(typeclass, basestring):
# a path is given. Load the actual typeclass # a path is given. Load the actual typeclass
typeclass = class_from_module(typeclass, settings.OBJECT_TYPECLASS_PATHS) typeclass = class_from_module(typeclass, settings.TYPECLASS_PATHS)
# Setup input for the create command. We use ObjectDB as baseclass here # Setup input for the create command. We use ObjectDB as baseclass here
# to give us maximum freedom (the typeclasses will load # to give us maximum freedom (the typeclasses will load
@ -154,7 +154,7 @@ def create_script(typeclass, key=None, obj=None, player=None, locks=None,
if isinstance(typeclass, basestring): if isinstance(typeclass, basestring):
# a path is given. Load the actual typeclass # a path is given. Load the actual typeclass
typeclass = class_from_module(typeclass, settings.SCRIPT_TYPECLASS_PATHS) typeclass = class_from_module(typeclass, settings.TYPECLASS_PATHS)
# validate input # validate input
kwarg = {} kwarg = {}
@ -289,7 +289,7 @@ def create_channel(key, aliases=None, desc=None,
if isinstance(typeclass, basestring): if isinstance(typeclass, basestring):
# a path is given. Load the actual typeclass # a path is given. Load the actual typeclass
typeclass = class_from_module(typeclass, settings.CHANNEL_TYPECLASS_PATHS) typeclass = class_from_module(typeclass, settings.TYPECLASS_PATHS)
# create new instance # create new instance
new_channel = typeclass(db_key=key) new_channel = typeclass(db_key=key)
@ -348,7 +348,7 @@ def create_player(key, email, password,
if isinstance(typeclass, basestring): if isinstance(typeclass, basestring):
# a path is given. Load the actual typeclass. # a path is given. Load the actual typeclass.
typeclass = class_from_module(typeclass, settings.OBJECT_TYPECLASS_PATHS) typeclass = class_from_module(typeclass, settings.TYPECLASS_PATHS)
# setup input for the create command. We use PlayerDB as baseclass # setup input for the create command. We use PlayerDB as baseclass
# here to give us maximum freedom (the typeclasses will load # here to give us maximum freedom (the typeclasses will load