Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r62896:2d69edccb7f6
Date: 2013-03-30 12:29 -0700
http://bitbucket.org/pypy/pypy/changeset/2d69edccb7f6/
Log: avoid threading here to prevent a circular import when importing re
diff --git a/lib_pypy/_collections.py b/lib_pypy/_collections.py
--- a/lib_pypy/_collections.py
+++ b/lib_pypy/_collections.py
@@ -10,7 +10,7 @@
import operator
try:
- from threading import _get_ident as _thread_ident
+ from _thread import _get_ident as _thread_ident
except ImportError:
def _thread_ident():
return -1
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
