Merge remote-tracking branch 'upstream/master'

This commit is contained in:
luyijun 2014-10-22 00:37:49 +08:00
commit 73e57422c7
13 changed files with 66 additions and 34 deletions

View file

@ -782,7 +782,8 @@ def mod_import(module):
def all_from_module(module):
"""
Return all global-level variables from a module as a dict
Return all global-level variables from a module as a dict.
Ignores modules and variable names starting with an underscore.
"""
mod = mod_import(module)
if not mod: