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

Starting to clean up and debug the server-side infrastructure

Browse source
This commit is contained in:
Griatch 2016-02-10 18:41:36 +01:00
parent e4d50ff74e
commit 96ace8c75f
9 changed files with 135 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

4
evennia/utils/utils.py
View file

@ -977,7 +977,7 @@ def all_from_module(module):
return {}
# make sure to only return variables actually defined in this module (not imports)
members = getmembers(mod, predicate=lambda obj: getmodule(obj) == mod)
return dict((key, val) for key, val in members.iteritems() if not key.startswith("_"))
return dict((key, val) for key, val in members if not key.startswith("_"))
#return dict((key, val) for key, val in mod.__dict__.items()
# if not (key.startswith("_") or ismodule(val)))
@ -1002,7 +1002,7 @@ def callables_from_module(module):
return {}
# make sure to only return callables actually defined in this module (not imports)
members = getmembers(mod, predicate=lambda obj: callable(obj) and getmodule(obj) == mod)
return dict((key, val) for key, val in members.iteritems() if not key.startswith("_"))
return dict((key, val) for key, val in members if not key.startswith("_"))
def variable_from_module(module, variable=None, default=None):