--- a/contrib/perf.py Wed Aug 07 20:12:07 2019 +0200
+++ b/contrib/perf.py Mon Aug 19 10:38:38 2019 -0700
@@ -132,7 +132,7 @@
_maxint = sys.maxsize # per py3 docs for replacing maxint
else:
_maxint = sys.maxint
-except (ImportError, AttributeError):
+except (NameError, ImportError, AttributeError):
import inspect
getargspec = inspect.getargspec
_byteskwargs = identity
@@ -144,11 +144,11 @@
try:
# 4.7+
queue = pycompat.queue.Queue
-except (AttributeError, ImportError):
+except (NameError, AttributeError, ImportError):
# <4.7.
try:
queue = pycompat.queue
- except (AttributeError, ImportError):
+ except (NameError, AttributeError, ImportError):
queue = util.queue
try: