diff options
| author | Jason Madden <jamadden@gmail.com> | 2015-06-02 13:56:11 -0500 |
|---|---|---|
| committer | Jason Madden <jamadden@gmail.com> | 2015-06-02 13:56:11 -0500 |
| commit | 3606074d3814d4876608ccfac13bf32cd0fe473e (patch) | |
| tree | 183d053322db4f69aa47a59cc7f41dcecc5aac7e | |
| parent | 349723661c15ea30dfd9df3bc32ae1df8c8ad0df (diff) | |
| parent | ee409d022cba7fed2ed8e2c35f92dfe56901a625 (diff) | |
| download | zope-security-3606074d3814d4876608ccfac13bf32cd0fe473e.tar.gz | |
Merge branch 'master' of https://github.com/zopefoundation/zope.security into pypy-support
| -rw-r--r-- | .travis.yml | 21 | ||||
| -rw-r--r-- | CHANGES.rst | 7 | ||||
| -rw-r--r-- | setup.py | 2 | ||||
| -rw-r--r-- | src/zope/security/checker.py | 2 | ||||
| -rw-r--r-- | src/zope/security/proxy.py | 2 |
5 files changed, 23 insertions, 11 deletions
diff --git a/.travis.yml b/.travis.yml index cd437ab..df74a27 100644 --- a/.travis.yml +++ b/.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 diff --git a/CHANGES.rst b/CHANGES.rst index 71bfffc..f420f45 100644 --- a/CHANGES.rst +++ b/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. @@ -105,7 +105,7 @@ else: ] 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', diff --git a/src/zope/security/checker.py b/src/zope/security/checker.py index 0495fbe..d5f261c 100644 --- a/src/zope/security/checker.py +++ b/src/zope/security/checker.py @@ -441,7 +441,7 @@ _available_by_default = [] # 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 diff --git a/src/zope/security/proxy.py b/src/zope/security/proxy.py index f023ca3..ccfd111 100644 --- a/src/zope/security/proxy.py +++ b/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 |