Merge branch 'py3-pure-python' into flake8

zopefoundation · May 3, 2017 · dad72db · dad72db
2 parents 4bb5c18 + d70a5f8
commit dad72db
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -3,11 +3,20 @@ Changelog
 
 For changes before version 3.0, see ``HISTORY.rst``.
 
-4.0 (unreleased)
-----------------
+4.0a5 (unreleased)
+------------------
+
+- Nothing changed yet.
+
+
+4.0a4 (2017-02-01)
+------------------
 
 - Use `@implementer` class decorator.
 
+- Remove ``AccessControl.Permission.name_trans`` to ease Python 3 migration.
+  Use ``AccessControl.Permission.getPermissionIdentifier()`` instead.
+
 4.0a3 (2016-08-05)
 ------------------
 

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -3,6 +3,7 @@ include *.rst
 
 recursive-include include *
 recursive-include src/AccessControl *
+recursive-include docs *.rst
 
 global-exclude *.dll
 global-exclude *.pyc

diff --git a/setup.py b/setup.py
@@ -38,7 +38,7 @@
                      join('include', 'Acquisition', 'Acquisition.h')]),
     ]
 
-__version__ = '4.0a4.dev0'
+__version__ = '4.0a5.dev0'
 
 setup(name='AccessControl',
       version=__version__,

diff --git a/src/AccessControl/User.py b/src/AccessControl/User.py
@@ -13,9 +13,9 @@
 """Access control package.
 """
 
-from AccessControl.users import emergency_user as super
-from AccessControl.users import UnrestrictedUser as Super
 # BBB
+from AccessControl.users import emergency_user
+from AccessControl.users import UnrestrictedUser as Super
 from AccessControl.users import _remote_user_mode
 from AccessControl.users import absattr
 from AccessControl.users import addr_match
@@ -34,7 +34,6 @@
 from zope.deferredimport import deprecated
 
 
-
 deprecated(
     "User folders are no longer part of AccessControl, please depend "
     "on Zope2 and import from OFS.userfolder or use the new minimal "