Merge pull request #48 from zopefoundation/py3_imports

Small improvements to Python 3 support using six.

.travis.yml

@@ -7,6 +7,7 @@ python:
     - 3.6
 
 install:
+    - pip install six==1.10.0 # force here to avoid conflit with zc.recipe.testrunner
     - pip install -U setuptools==33.1.1
     - pip install coveralls coverage
     - pip install zc.buildout

CHANGES.rst

@@ -6,7 +6,7 @@ For changes before version 3.0, see ``HISTORY.rst``.
 4.0b2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Python 2 / 3 import improvements.
 
 
 4.0b1 (2017-09-15)

src/AccessControl/SecurityManagement.py

@@ -41,11 +41,7 @@ def setSecurityManager(manager):
 
 # AccessControl.Implementation inserts SecurityManager.
 
-try:
-    from thread import get_ident
-except ImportError:
-    def get_ident():
-        return 0
+from six.moves._thread import get_ident
 
 _managers = {}
 

src/AccessControl/ZopeGuards.py

@@ -13,7 +13,6 @@
 
 from __future__ import absolute_import
 
-from functools import reduce
 import math
 import random
 import six
@@ -27,6 +26,7 @@
 from RestrictedPython.Guards import guarded_unpack_sequence
 from RestrictedPython.Guards import safe_builtins
 from RestrictedPython.Utilities import utility_builtins
+from six.moves import reduce
 from zExceptions import Unauthorized
 
 from AccessControl.SecurityInfo import secureModule

src/AccessControl/__init__.py

@@ -49,8 +49,8 @@
 
 if six.PY2:
     # Same for unicode instead on Python 2:
-    rules = dict([(m, True) for m in dir(unicode) if not m.startswith('_')])
+    rules = dict([(m, True) for m in dir(six.text_type) if not m.startswith('_')])
     rules['format'] = safe_format
-    allow_type(unicode, rules)
+    allow_type(six.text_type, rules)
 
 del six

src/AccessControl/tests/testZopeSecurityPolicy.py

@@ -23,10 +23,9 @@
 from AccessControl.SecurityManagement import SecurityContext
 from AccessControl.userfolder import UserFolder
 
-try:
-    import _thread as thread  # Py3
-except ImportError:
-    import thread
+
+from six.moves import _thread as thread
+
 
 user_roles = ('RoleOfUser',)
 eo_roles = ('RoleOfExecutableOwner',)