Small tweaks to setup.py, extend tox.ini to test all versions.

setup.py

@@ -12,12 +12,16 @@
 #
 ##############################################################################
 
-from os.path import join
-from setuptools import setup, find_packages, Extension
 import os
+from os.path import join
 import platform
 import sys
 
+from setuptools import setup, find_packages, Extension
+
+README = open('README.rst').read()
+CHANGES = open('CHANGES.rst').read()
+
 # PyPy won't build the extension
 py_impl = getattr(platform, 'python_implementation', lambda: None)
 is_pypy = py_impl() == 'PyPy'
@@ -35,16 +39,16 @@
                      join('include', 'Acquisition', 'Acquisition.h')]),
     ]
 
+__version__ = '4.0a4.dev0'
 
 setup(name='AccessControl',
-      version='4.0a4.dev0',
+      version=__version__,
       url='http://pypi.python.org/pypi/AccessControl',
       license='ZPL 2.1',
       description="Security framework for Zope2.",
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
-      long_description=(open('README.rst').read() + '\n' +
-                        open('CHANGES.rst').read()),
+      long_description=README + '\n\n' + CHANGES,
       packages=find_packages('src'),
       package_dir={'': 'src'},
       classifiers=[

src/AccessControl/ImplC.py

@@ -13,23 +13,17 @@
 
 """C implementation of the access control machinery."""
 
-try:
-    from AccessControl.cAccessControl import rolesForPermissionOn
-    from AccessControl.cAccessControl import PermissionRole
-    from AccessControl.cAccessControl import imPermissionRole
-    from AccessControl.cAccessControl import _what_not_even_god_should_do
-    from AccessControl.cAccessControl import aq_validate
-    from AccessControl.cAccessControl import guarded_getattr
-    from AccessControl.cAccessControl import setDefaultBehaviors
-    from AccessControl.cAccessControl import ZopeSecurityPolicy \
-        as cZopeSecurityPolicy
-    from AccessControl.cAccessControl import SecurityManager \
-        as cSecurityManager
-except ImportError:
-    import sys
-    # make sure a partial import doesn't pollute sys.modules
-    del sys.modules[__name__]
-    raise
+from AccessControl.cAccessControl import rolesForPermissionOn
+from AccessControl.cAccessControl import PermissionRole
+from AccessControl.cAccessControl import imPermissionRole
+from AccessControl.cAccessControl import _what_not_even_god_should_do
+from AccessControl.cAccessControl import aq_validate
+from AccessControl.cAccessControl import guarded_getattr
+from AccessControl.cAccessControl import setDefaultBehaviors
+from AccessControl.cAccessControl import ZopeSecurityPolicy \
+    as cZopeSecurityPolicy
+from AccessControl.cAccessControl import SecurityManager \
+    as cSecurityManager
 
 from AccessControl.ImplPython import SecurityManager
 from AccessControl.ImplPython import ZopeSecurityPolicy
@@ -40,6 +34,7 @@ class ZopeSecurityPolicy(cZopeSecurityPolicy, ZopeSecurityPolicy):
     executable context and policies
     """
 
+
 class SecurityManager(cSecurityManager, SecurityManager):
     """A security manager provides methods for checking access and managing
     executable context and policies

tox.ini

@@ -1,13 +1,13 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py33,py34,py35,py36,pypy
 
 [testenv]
-install_command = pip install --egg --no-use-wheel {opts} {packages}
-usedevelop = True
-setenv = PURE_PYTHON=1
+install_command = pip install --no-cache-dir --no-binary=:all: {opts} {packages}
 commands =
     zope-testrunner --test-path=src {posargs:-pvc}
 deps =
     zope.testrunner
     ../Persistence
     .[test]
+setenv =
+    PIP_NO_CACHE = 1