From 323a353ec373fdbecd91b75fc4238191def884e6 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 14 Feb 2016 08:46:55 +0100 Subject: [PATCH] Fixed a regression in the changes made to all_from_module that caused evform to fail. --- evennia/utils/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/evennia/utils/utils.py b/evennia/utils/utils.py index 30c256a3a4..4e79bd1073 100644 --- a/evennia/utils/utils.py +++ b/evennia/utils/utils.py @@ -975,8 +975,9 @@ def all_from_module(module): mod = mod_import(module) if not mod: return {} - # make sure to only return variables actually defined in this module (not imports) - members = getmembers(mod, predicate=lambda obj: getmodule(obj) == mod) + # make sure to only return variables actually defined in this + # module if available (try to avoid not imports) + members = getmembers(mod, predicate=lambda obj: getmodule(obj) in (mod, None)) 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)))