Merge branch 'master' of https://github.com/zopefoundation/zope.security

 into pypy-support

.travis.yml

@@ -1,13 +1,20 @@
 language: python
 sudo: false
-python:
-    - 2.6
-    - 2.7
-    - 3.2
-    - 3.3
+env:
+    - TOXENV=py26
+    - TOXENV=py27
+    - TOXENV=py27-pure
+    - TOXENV=py32
+    - TOXENV=py33
+    - TOXENV=py33-pure
+    - TOXENV=py34
+    - TOXENV=pypy
+    - TOXENV=pypy3
+    - TOXENV=coverage
+    - TOXENV=docs
 install:
-    - pip install . --use-mirrors
+    - pip install tox
 script:
-    - python setup.py test -q
+    - tox
 notifications:
     email: false

CHANGES.rst

@@ -1,7 +1,12 @@
 Changes
 =======
 
-4.0.2 (unreleased)
+4.0.3 (unreleased)
+------------------
+
+- TBD
+
+4.0.2 (2015-06-02)
 ------------------
 
 - Fixed compatibility with ``zope.proxy`` 4.1.5 under PyPy.

setup.py

@@ -105,7 +105,7 @@ def __str__(self):
     ]
 
 setup(name='zope.security',
-      version='4.0.2.dev0',
+      version='4.0.3.dev0',
       author='Zope Foundation and Contributors',
       author_email='zope-dev@zope.org',
       description='Zope Security Framework',

src/zope/security/checker.py

@@ -441,7 +441,7 @@ def undefineChecker(type_):
 # Get optimized versions
 try:
     import zope.security._zope_security_checker
-except ImportError: #pragma NO COVER
+except (ImportError, AttributeError): #pragma NO COVER PyPy / PURE_PYTHON
     pass
 else:
     from zope.security._zope_security_checker import _checkers, selectChecker

src/zope/security/proxy.py

@@ -327,7 +327,7 @@ def getObjectPy(proxy):
 
 try:
     from zope.security._proxy import _Proxy
-except ImportError: #pragma NO COVER PyPy
+except (ImportError, AttributeError): #pragma NO COVER PyPy / PURE_PYTHON
     getChecker = getCheckerPy
     getObject = getObjectPy
     Proxy = ProxyPy