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 /src | |
| 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
Diffstat (limited to 'src')
| -rw-r--r-- | src/zope/security/checker.py | 2 | ||||
| -rw-r--r-- | src/zope/security/proxy.py | 2 |
2 files changed, 2 insertions, 2 deletions
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 |