Skip to content

Commit

Permalink
Get 'py35-pure' tox environment passing.
Browse files Browse the repository at this point in the history
On Py3k, the conditional imports fail with an AttributeError when the
C extensions are missing, rather than an ImportError.
  • Loading branch information
tseaver committed Dec 22, 2016
1 parent 1fb3867 commit 122de79
Show file tree
Hide file tree
Showing 11 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion BTrees/IFBTree.py
Expand Up @@ -106,7 +106,7 @@ class IFTreeIteratorPy(_TreeIterator):

try:
from ._IFBTree import IFBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
IFBucket = IFBucketPy
IFSet = IFSetPy
IFBTree = IFBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/IIBTree.py
Expand Up @@ -107,7 +107,7 @@ class IITreeIteratorPy(_TreeIterator):

try:
from ._IIBTree import IIBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
IIBucket = IIBucketPy
IISet = IISetPy
IIBTree = IIBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/IOBTree.py
Expand Up @@ -89,7 +89,7 @@ class IOTreeIteratorPy(_TreeIterator):

try:
from ._IOBTree import IOBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
IOBucket = IOBucketPy
IOSet = IOSetPy
IOBTree = IOBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/LFBTree.py
Expand Up @@ -107,7 +107,7 @@ class LFTreeIteratorPy(_TreeIterator):

try:
from ._LFBTree import LFBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
LFBucket = LFBucketPy
LFSet = LFSetPy
LFBTree = LFBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/LLBTree.py
Expand Up @@ -107,7 +107,7 @@ class LLTreeIteratorPy(_TreeIterator):

try:
from ._LLBTree import LLBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
LLBucket = LLBucketPy
LLSet = LLSetPy
LLBTree = LLBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/LOBTree.py
Expand Up @@ -90,7 +90,7 @@ class LOTreeIteratorPy(_TreeIterator):

try:
from ._LOBTree import LOBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
LOBucket = LOBucketPy
LOSet = LOSetPy
LOBTree = LOBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/OIBTree.py
Expand Up @@ -104,7 +104,7 @@ class OITreeIteratorPy(_TreeIterator):

try:
from ._OIBTree import OIBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
OIBucket = OIBucketPy
OISet = OISetPy
OIBTree = OIBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/OLBTree.py
Expand Up @@ -105,7 +105,7 @@ class OLTreeIteratorPy(_TreeIterator):

try:
from ._OLBTree import OLBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
OLBucket = OLBucketPy
OLSet = OLSetPy
OLBTree = OLBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/OOBTree.py
Expand Up @@ -85,7 +85,7 @@ class OOTreeIteratorPy(_TreeIterator):

try:
from ._OOBTree import OOBucket
except ImportError as e: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
OOBucket = OOBucketPy
OOSet = OOSetPy
OOBTree = OOBTreePy
Expand Down
2 changes: 1 addition & 1 deletion BTrees/_base.py
Expand Up @@ -49,7 +49,7 @@ def __init__(self, items=None):
# If the C extensions are around, we do need these methods, but
# these classes are unlikely to be used in production anyway.
__import__('BTrees._OOBTree')
except ImportError: # pragma: no cover
except (ImportError, AttributeError): # pragma: no cover
pass
else:
def __reduce__(self):
Expand Down
2 changes: 1 addition & 1 deletion BTrees/fsBTree.py
Expand Up @@ -103,7 +103,7 @@ class fsTreeSetPy(TreeSet):

try:
from ._fsBTree import fsBucket
except ImportError: #pragma NO COVER w/ C extensions
except (ImportError, AttributeError): #pragma NO COVER w/ C extensions
fsBucket = fsBucketPy
fsSet = fsSetPy
fsBTree = fsBTreePy
Expand Down

0 comments on commit 122de79

Please sign in to comment.