flake8 :))

.coveragerc

@@ -1,6 +1,6 @@
 [run]
 branch = True
-source = RestrictedPython
+source = AccessControl
 omit =
     src/AccessControl/tests
     src/AccessControl/tests/*.py

.travis.yml

@@ -6,32 +6,16 @@ python:
     - 3.4
     - 3.5
     - 3.6
-    - pypy-5.4
-
-env:
-    - ENVIRON=py
-    - ENVIORN=isort,flake8,docs
-
-matrix:
-    exclude:
-        - env: ENVIRON=isort,flake8,docs
-    include:
-        - python: "3.6"
-          env: ENVIRON=isort,flake8,docs
+    - pypy
+    - pypy3.3-5.2-alpha1
 
 install:
-    - pip install tox coveralls coverage
     - python bootstrap.py
     - bin/buildout
 
 script:
-    - tox -e $ENVIRON
     - bin/test -v1
 
-after_sucess:
-    - coverage combine
-    - coveralls
-
 notifications:
     email: false
 

src/AccessControl/AuthEncoding.py

@@ -12,21 +12,15 @@
 ##############################################################################
 
 from __future__ import absolute_import
-from AuthEncoding.AuthEncoding import constant_time_compare
-from AuthEncoding.AuthEncoding import is_encrypted
-from AuthEncoding.AuthEncoding import listSchemes
-from AuthEncoding.AuthEncoding import MySQLDigestScheme
-from AuthEncoding.AuthEncoding import PasswordEncryptionScheme
-from AuthEncoding.AuthEncoding import pw_encode
-from AuthEncoding.AuthEncoding import pw_encrypt
-from AuthEncoding.AuthEncoding import pw_validate
-from AuthEncoding.AuthEncoding import registerScheme
-from AuthEncoding.AuthEncoding import SHADigestScheme
-from AuthEncoding.AuthEncoding import SSHADigestScheme
 
+# BBB
+from AuthEncoding.AuthEncoding import (  # NOQA
+    constant_time_compare, PasswordEncryptionScheme, registerScheme,
+    listSchemes, SSHADigestScheme, SHADigestScheme, MySQLDigestScheme,
+    pw_validate, is_encrypted, pw_encrypt, pw_encode)
 
 # Bogosity on various platforms due to ITAR restrictions
 try:
-    from AuthEncoding.AuthEncoding import CryptDigestScheme
+    from AuthEncoding.AuthEncoding import CryptDigestScheme  # NOQA
 except ImportError:
     pass

src/AccessControl/ImplPython.py

@@ -13,21 +13,8 @@
 
 """Python implementation of the access control machinery."""
 
-from AccessControl.interfaces import ISecurityManager
-from AccessControl.interfaces import ISecurityPolicy
-from AccessControl.Permission import getPermissionIdentifier
-from AccessControl.SecurityManagement import getSecurityManager
-from AccessControl.SimpleObjectPolicies import _noroles
-from AccessControl.SimpleObjectPolicies import Containers
-from AccessControl.unauthorized import Unauthorized
-from AccessControl.ZopeGuards import guarded_getitem
-# AccessControl.ZopeSecurityPolicy
-# --------------------------------
-#
-#   TODO:  implement this in cAccessControl, and have Implementation
-#          do the indirection.
-#
-from AccessControl.ZopeSecurityPolicy import getRoles  # XXX
+import os
+
 from Acquisition import aq_acquire
 from Acquisition import aq_base
 from Acquisition import aq_inContextOf
@@ -37,10 +24,6 @@
 from logging import getLogger
 from zope.interface import implementer
 
-import os
-import string
-
-
 # This is used when a permission maps explicitly to no permission.  We
 # try and get this from cAccessControl first to make sure that if both
 # security implementations exist, we can switch between them later.
@@ -49,6 +32,22 @@
 except ImportError:
     _what_not_even_god_should_do = []
 
+from AccessControl.interfaces import ISecurityManager
+from AccessControl.interfaces import ISecurityPolicy
+from AccessControl.Permission import getPermissionIdentifier
+from AccessControl.SecurityManagement import getSecurityManager
+from AccessControl.SimpleObjectPolicies import _noroles
+from AccessControl.SimpleObjectPolicies import Containers
+from AccessControl.unauthorized import Unauthorized
+from AccessControl.ZopeGuards import guarded_getitem  # NOQA
+# AccessControl.ZopeSecurityPolicy
+# --------------------------------
+#
+#   TODO:  implement this in cAccessControl, and have Implementation
+#          do the indirection.
+#
+from AccessControl.ZopeSecurityPolicy import getRoles  # XXX
+
 
 LOG = getLogger('ImplPython')
 

src/AccessControl/PermissionMapping.py

@@ -17,15 +17,17 @@
 need the object's ordinary permissions intact so we can manage it.
 """
 
+from cgi import escape
+
+from Acquisition import ImplicitAcquisitionWrapper
+from ExtensionClass import Base
+from zope.interface import implementer
+
 from AccessControl.class_init import InitializeClass
 from AccessControl.interfaces import IPermissionMappingSupport
 from AccessControl.owner import UnownableOwner
 from AccessControl.Permission import getPermissionIdentifier
 from AccessControl.requestmethod import requestmethod
-from Acquisition import ImplicitAcquisitionWrapper
-from cgi import escape
-from ExtensionClass import Base
-from zope.interface import implementer
 
 
 @implementer(IPermissionMappingSupport)

src/AccessControl/SecurityInfo.py

@@ -38,13 +38,14 @@
 
 """
 
-from AccessControl.class_init import InitializeClass
-from AccessControl.ImplPython import _what_not_even_god_should_do
-from Acquisition import Implicit
 from logging import getLogger
+import sys
+
+from Acquisition import Implicit
 from Persistence import Persistent
 
-import sys
+from AccessControl.class_init import InitializeClass
+from AccessControl.ImplPython import _what_not_even_god_should_do
 
 
 # always patch Persistent before ClassSecurityInfo is used

src/AccessControl/SecurityManagement.py

@@ -12,8 +12,8 @@
 ##############################################################################
 """Security management
 """
-from . import SpecialUsers
 from __future__ import absolute_import
+from . import SpecialUsers
 
 
 def getSecurityManager():

src/AccessControl/User.py

@@ -13,9 +13,11 @@
 """Access control package.
 """
 
+from zope.deferredimport import deprecated
+
+# BBB
 from .users import emergency_user as super
 from .users import UnrestrictedUser as Super
-# BBB
 from .users import _remote_user_mode
 from .users import absattr
 from .users import addr_match
@@ -31,7 +33,6 @@
 from .users import SpecialUser
 from .users import system
 from .users import User
-from zope.deferredimport import deprecated
 
 
 deprecated("User folders are no longer part of AccessControl, please depend "

src/AccessControl/ZopeGuards.py

@@ -12,23 +12,25 @@
 ##############################################################################
 
 from __future__ import absolute_import
-from AccessControl.SecurityInfo import secureModule
-from AccessControl.SecurityManagement import getSecurityManager
-from AccessControl.SimpleObjectPolicies import ContainerAssertions
-from AccessControl.SimpleObjectPolicies import Containers
+
 from functools import reduce
+import math
+import random
+import string
+import sys
+import warnings
+
+import RestrictedPython
 from RestrictedPython.Eval import RestrictionCapableEval
 from RestrictedPython.Guards import full_write_guard
 from RestrictedPython.Guards import safe_builtins
 from RestrictedPython.Utilities import utility_builtins
 from zExceptions import Unauthorized
 
-import math
-import random
-import RestrictedPython
-import string
-import sys
-import warnings
+from AccessControl.SecurityInfo import secureModule
+from AccessControl.SecurityManagement import getSecurityManager
+from AccessControl.SimpleObjectPolicies import ContainerAssertions
+from AccessControl.SimpleObjectPolicies import Containers
 
 
 _marker = []  # Create a new marker object.

src/AccessControl/ZopeSecurityPolicy.py

@@ -13,10 +13,12 @@
 """Define Zope's default security policy
 """
 from __future__ import absolute_import
+
+from types import MethodType
+
 # AccessControl.Implementation inserts:
 #   ZopeSecurityPolicy, getRoles, rolesForPermissionOn
 from AccessControl.SimpleObjectPolicies import _noroles
-from types import MethodType
 
 
 rolesForPermissionOn = None  # XXX:  avoid import loop

src/AccessControl/class_init.py

@@ -13,10 +13,10 @@
 """Class initialization.
 """
 
-from AccessControl.Permission import ApplicationDefaultPermissions
-
 import logging
 
+from AccessControl.Permission import ApplicationDefaultPermissions
+
 
 def InitializeClass(self):
     from AccessControl.Permission import registerPermissions

src/AccessControl/metaconfigure.py

@@ -12,11 +12,12 @@
 #
 ##############################################################################
 
-from AccessControl.class_init import InitializeClass
-from AccessControl.security import protectName
+import warnings
+
 from zope.security import metaconfigure
 
-import warnings
+from AccessControl.class_init import InitializeClass
+from AccessControl.security import protectName
 
 
 class ClassDirective(metaconfigure.ClassDirective):

src/AccessControl/owner.py

@@ -13,19 +13,20 @@
 """Support for owned objects
 """
 
+from Acquisition import aq_base
+from Acquisition import aq_get
+from Acquisition import aq_inner
+from Acquisition import aq_parent
+from ExtensionClass import Base
+from zope.interface import implementer
+
 from AccessControl import SpecialUsers as SU
 from AccessControl.class_init import InitializeClass
 from AccessControl.interfaces import IOwned
 from AccessControl.Permissions import take_ownership
 from AccessControl.Permissions import view_management_screens
 from AccessControl.SecurityInfo import ClassSecurityInfo
 from AccessControl.SecurityManagement import getSecurityManager
-from Acquisition import aq_base
-from Acquisition import aq_get
-from Acquisition import aq_inner
-from Acquisition import aq_parent
-from ExtensionClass import Base
-from zope.interface import implementer
 
 
 UnownableOwner=[]

src/AccessControl/requestmethod.py

@@ -11,14 +11,15 @@
 #
 ##############################################################################
 
+import inspect
+
 from zExceptions import Forbidden
 from zope.publisher.interfaces.browser import IBrowserRequest
 
-import inspect
-
 
 _default = []
 
+
 def _buildFacade(name, spec, docstring):
     """Build a facade function, matching the decorated method in signature.
     

src/AccessControl/rolemanager.py

@@ -12,6 +12,16 @@
 ##############################################################################
 """Access control support
 """
+
+from base64 import urlsafe_b64encode
+from cgi import escape
+
+from Acquisition import Acquired
+from Acquisition import aq_base
+from Acquisition import aq_get
+from ExtensionClass import Base
+from zope.interface import implementer
+
 from AccessControl import ClassSecurityInfo
 from AccessControl.class_init import InitializeClass
 from AccessControl.interfaces import IRoleManager
@@ -20,13 +30,6 @@
 from AccessControl.PermissionMapping import RoleManager
 from AccessControl.Permissions import change_permissions
 from AccessControl.SecurityManagement import newSecurityManager
-from Acquisition import Acquired
-from Acquisition import aq_base
-from Acquisition import aq_get
-from base64 import urlsafe_b64encode
-from cgi import escape
-from ExtensionClass import Base
-from zope.interface import implementer
 
 
 DEFAULTMAXLISTUSERS = 250

src/AccessControl/security.py

@@ -14,9 +14,6 @@
 """Security handling
 """
 
-from AccessControl.Permission import addPermission
-from AccessControl.SecurityInfo import ClassSecurityInfo
-from AccessControl.SecurityManagement import getSecurityManager
 from zope.component import getUtility
 from zope.component import queryUtility
 from zope.component.zcml import utility
@@ -35,6 +32,10 @@
 from zope.security.simplepolicies import ParanoidSecurityPolicy
 from zope.security.zcml import IPermissionDirective
 
+from AccessControl.Permission import addPermission
+from AccessControl.SecurityInfo import ClassSecurityInfo
+from AccessControl.SecurityManagement import getSecurityManager
+
 
 CheckerPublicId = 'zope.Public'
 CheckerPrivateId = 'zope2.Private'