Upgrade syntax to be mostly idiomatic python 2.7.

So we have a baseline from which to bootstrap python 3 porting while retaining python 2.7 compatibility.

src/AccessControl/ImplPython.py

@@ -674,7 +674,7 @@ def guarded_getattr(inst, name, default=_marker):
         raise
 
     try:
-        container = v.im_self
+        container = v.__self__
     except AttributeError:
         container = aq_parent(aq_inner(v)) or inst
 
@@ -826,7 +826,7 @@ def verifyAcquisitionContext(user, object, object_roles=None):
             return 1
         if hasattr(object, 'im_self'):
             # This is a method.  Grab its self.
-            object=object.im_self
+            object=object.__self__
         if not aq_inContextOf(object, ucontext, 1):
             if 'Shared' in object_roles:
                 # Old role setting. Waaa

src/AccessControl/Permission.py

@@ -56,7 +56,7 @@ def getRoles(self, default=_marker):
                 if hasattr(obj, name):
                     attr = getattr(obj, name)
                     if hasattr(attr, 'im_self'):
-                        attr = attr.im_self
+                        attr = attr.__self__
                         if hasattr(attr, '__dict__'):
                             attr = attr.__dict__
                             name = name + '__roles__'

src/AccessControl/PermissionMapping.py

@@ -114,7 +114,7 @@ def getPermissionMapping(name, obj, st=type('')):
 def setPermissionMapping(name, obj, v):
     name=getPermissionIdentifier(name)
     if v: setattr(obj, name, getPermissionIdentifier(v))
-    elif obj.__dict__.has_key(name): delattr(obj, name)
+    elif name in obj.__dict__: delattr(obj, name)
 
 class PM(Base):
     _owner=UnownableOwner
@@ -154,4 +154,4 @@ def __call__(self, *args, **kw):
         self=m.__of__(
             ImplicitAcquisitionWrapper(
                 w, parent))
-        return apply(self, args, kw)
+        return self(*args, **kw)

src/AccessControl/ZopeGuards.py

@@ -26,6 +26,7 @@
 from .SecurityInfo import secureModule
 from .SimpleObjectPolicies import Containers, ContainerAssertions
 from zExceptions import Unauthorized
+from functools import reduce
 
 _marker = []  # Create a new marker object.
 

src/AccessControl/ZopeSecurityPolicy.py

@@ -37,7 +37,7 @@ def getRoles(container, name, value, default):
             return default
 
         if type(value) is MethodType:
-            container = value.im_self
+            container = value.__self__
 
         cls = getattr(container, '__class__', None)
         if cls is None:

src/AccessControl/security.py

@@ -43,7 +43,7 @@
 def getSecurityInfo(klass):
     sec = {}
     info = vars(klass)
-    if info.has_key('__ac_permissions__'):
+    if '__ac_permissions__' in info:
         sec['__ac_permissions__'] = info['__ac_permissions__']
     for k, v in info.items():
         if k.endswith('__roles__'):
@@ -53,7 +53,7 @@ def getSecurityInfo(klass):
 
 def clearSecurityInfo(klass):
     info = vars(klass)
-    if info.has_key('__ac_permissions__'):
+    if '__ac_permissions__' in info:
         delattr(klass, '__ac_permissions__')
     for k, v in info.items():
         if k.endswith('__roles__'):

src/AccessControl/tests/actual_python.py

@@ -89,7 +89,7 @@ def display(self):
 f6()
 
 def f7():
-    d = apply(dict, [((1, 2), (3, 4))]) # {1: 2, 3: 4}
+    d = dict(*[((1, 2), (3, 4))]) # {1: 2, 3: 4}
     expected = {'k': [1, 3],
                 'v': [2, 4],
                 'i': [(1, 2), (3, 4)]}
@@ -138,7 +138,7 @@ def f8():
 # So do something to touch them.
 def f9():
     d = DateTime()
-    print d # this one provoked _print_
+    print(d) # this one provoked _print_
 
     # Funky.  This probably isn't an intended use of reorder, but I'm
     # not sure why it exists.
@@ -155,7 +155,7 @@ def f9():
 f9()
 
 def f10():
-    assert iter(enumerate(iter(iter(range(9))))).next() == (0, 0)
+    assert next(iter(enumerate(iter(iter(range(9)))))) == (0, 0)
 f10()
 
 def f11():

src/AccessControl/tests/testZopeGuards.py

@@ -201,7 +201,7 @@ def test_iterkeys_validates(self):
             old = self.setSecurityManager(sm)
             iterkeys = get_iter({GuardTestCase: 1}, 'iterkeys')
             try:
-                iterkeys().next()
+                next(iterkeys())
             finally:
                 self.setSecurityManager(old)
             self.assert_(sm.calls)
@@ -227,7 +227,7 @@ def test_itervalues_validates(self):
             old = self.setSecurityManager(sm)
             itervalues = get_iter({GuardTestCase: 1}, 'itervalues')
             try:
-                itervalues().next()
+                next(itervalues())
             finally:
                 self.setSecurityManager(old)
             self.assert_(sm.calls)
@@ -404,9 +404,9 @@ def test_enumerate_succeeds(self):
         sm = SecurityManager() # accepts
         old = self.setSecurityManager(sm)
         enum = guarded_enumerate([1,2,3])
-        self.assertEqual(enum.next(), (0,1))
-        self.assertEqual(enum.next(), (1,2))
-        self.assertEqual(enum.next(), (2,3))
+        self.assertEqual(next(enum), (0,1))
+        self.assertEqual(next(enum), (1,2))
+        self.assertEqual(next(enum), (2,3))
         self.assertRaises(StopIteration, enum.next)
         self.setSecurityManager(old)
 

src/AccessControl/userfolder.py

@@ -294,7 +294,7 @@ def _getobcontext(self, v, request):
             c = innerparent
         elif hasattr(v, 'im_self'):
             # this is a method, we need to treat it specially
-            c = v.im_self
+            c = v.__self__
             c = getattr(v, 'aq_inner', v)
         request_container = getattr(request['PARENTS'][-1], '__parent__', [])
         # if pub's __parent__ or container is the request container, it

src/AccessControl/users.py

@@ -98,7 +98,7 @@ def getRolesInContext(self, object):
                 object = parent
                 continue
             if hasattr(object, 'im_self'):
-                object=object.im_self
+                object=object.__self__
                 object=getattr(object, 'aq_inner', object)
                 continue
             break
@@ -140,7 +140,7 @@ def _check_context(self, object):
                 return 1
             if hasattr(object, 'im_self'):
                 # This is a method.  Grab its self.
-                object = object.im_self
+                object = object.__self__
             return aq_inContextOf(object, context, 1)
 
         # This is lame, but required to keep existing behavior.
@@ -201,7 +201,7 @@ def allowed(self, object, object_roles=None):
                 inner_obj = parent
                 continue
             if hasattr(inner_obj, 'im_self'):
-                inner_obj = inner_obj.im_self
+                inner_obj = inner_obj.__self__
                 inner_obj = getattr(inner_obj, 'aq_inner', inner_obj)
                 continue
             break