[Checkins] SVN: AccessControl/trunk/ Merged r117588, r117590 from Zope 2.12 branch

[Hanno Schlichting]

Log message for revision 117591:
  Merged r117588, r117590 from Zope 2.12 branch
  

Changed:
  U   AccessControl/trunk/CHANGES.txt
  U   AccessControl/trunk/src/AccessControl/ZopeGuards.py
  U   AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py

-=-
Modified: AccessControl/trunk/CHANGES.txt
===================================================================
--- AccessControl/trunk/CHANGES.txt	2010-10-17 11:34:44 UTC (rev 117590)
+++ AccessControl/trunk/CHANGES.txt	2010-10-17 11:36:50 UTC (rev 117591)
@@ -5,7 +5,7 @@
 -------------------
 
 - LP #659968: Added support for level argument to the ``__import__`` function
-  as introduced in Python 2.5. Currently only level=0 is supported.
+  as introduced in Python 2.5. Currently only level=-1 is supported.
 
 2.13.3 (2010-08-28)
 -------------------

Modified: AccessControl/trunk/src/AccessControl/ZopeGuards.py
===================================================================
--- AccessControl/trunk/src/AccessControl/ZopeGuards.py	2010-10-17 11:34:44 UTC (rev 117590)
+++ AccessControl/trunk/src/AccessControl/ZopeGuards.py	2010-10-17 11:36:50 UTC (rev 117591)
@@ -284,7 +284,7 @@
 safe_builtins['zip'] = guarded_zip
 
 def guarded_import(mname, globals=None, locals=None, fromlist=None,
-                   level=0):
+                   level=-1):
     if fromlist is None:
         fromlist = ()
     if '*' in fromlist:
@@ -294,7 +294,7 @@
     if locals is None:
         locals = {}
     # Refs https://bugs.launchpad.net/zope2/+bug/659968
-    if level != 0:
+    if level != -1:
         raise Unauthorized("Using import with a level specification isn't "
                            "supported by AccessControl: %s" % mname)
 

Modified: AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py
===================================================================
--- AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py	2010-10-17 11:34:44 UTC (rev 117590)
+++ AccessControl/trunk/src/AccessControl/tests/testModuleSecurity.py	2010-10-17 11:36:50 UTC (rev 117591)
@@ -32,13 +32,13 @@
             if module in sys.modules:
                 del sys.modules[module]
 
-    def assertUnauth(self, module, fromlist, level=0):
+    def assertUnauth(self, module, fromlist, level=-1):
         from zExceptions import Unauthorized
         from AccessControl.ZopeGuards import guarded_import
         self.assertRaises(Unauthorized, guarded_import, module,
                           fromlist=fromlist, level=level)
 
-    def assertAuth(self, module, fromlist, level=0):
+    def assertAuth(self, module, fromlist, level=-1):
         from AccessControl.ZopeGuards import guarded_import
         guarded_import(module, fromlist=fromlist, level=level)
 
@@ -76,10 +76,10 @@
                       guarded_import, 'AccessControl.tests.nonesuch', ())
         self.failUnless('AccessControl.tests.nonesuch' in MS)
 
-    def test_level_zero(self):
-        self.assertAuth('AccessControl.tests.public_module', (), level=0)
+    def test_level_default(self):
+        self.assertAuth('AccessControl.tests.public_module', (), level=-1)
 
-    def test_level_nonzero(self):
+    def test_level_nondefault(self):
         self.assertUnauth('AccessControl.tests.public_module', (), level=1)