Merge branch 'master' into zodbupdate

zopefoundation · Oct 4, 2018 · 8453a67 · 8453a67
2 parents c739146 + d66b328
commit 8453a67
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -13,6 +13,8 @@ For changes before version 3.0, see ``HISTORY.rst``.
 
 - Add support for Python 3.7.
 
+- Remove duplicate guard against * imports. (#60)
+
 4.0b4 (2018-04-16)
 ------------------
 

diff --git a/src/AccessControl/ZopeGuards.py b/src/AccessControl/ZopeGuards.py
@@ -390,8 +390,6 @@ def guarded_import(mname, globals=None, locals=None, fromlist=None,
                    level=import_default_level):
     if fromlist is None:
         fromlist = ()
-    if '*' in fromlist:
-        raise Unauthorized("'from %s import *' is not allowed")
     if globals is None:
         globals = {}
     if locals is None:
@@ -406,8 +404,6 @@ def guarded_import(mname, globals=None, locals=None, fromlist=None,
     module = load_module(None, None, mnameparts, validate, globals, locals)
     if module is None:
         raise Unauthorized("import of '%s' is unauthorized" % mname)
-    if fromlist is None:
-        fromlist = ()
     for name in fromlist:
         v = getattr(module, name, None)
         if v is None: