[pypy-svn] r78904 - pypy/branch/fast-forward/lib-python/2.7.0

[afa at codespeak.net]

Author: afa
Date: Tue Nov  9 08:38:49 2010
New Revision: 78904

Modified:
   pypy/branch/fast-forward/lib-python/2.7.0/collections.py
Log:
Pull a change I just made in CPython


Modified: pypy/branch/fast-forward/lib-python/2.7.0/collections.py
==============================================================================
--- pypy/branch/fast-forward/lib-python/2.7.0/collections.py	(original)
+++ pypy/branch/fast-forward/lib-python/2.7.0/collections.py	Tue Nov  9 08:38:49 2010
@@ -14,7 +14,7 @@
                       ifilter as _ifilter, imap as _imap
 try:
     from thread import get_ident
-except AttributeError:
+except ImportError:
     from dummy_thread import get_ident
 
 def _recursive_repr(user_function):