Merge pull request michilu#2 from MeilleursAgents/fix_thread_module_import

michilu · michilu · commit 92ae05553bef · 2015-07-11T09:17:49.000+07:00
Fix `thread` module import on Python 2.7
diff --git a/functools32/_dummy_thread32.py b/functools32/_dummy_thread32.py
@@ -6,7 +6,10 @@
 Suggested usage is::
 
     try:
-        import _thread
+        try:
+            import _thread  # Python >= 3
+        except:
+            import thread as _thread  # Python < 3
     except ImportError:
         import _dummy_thread as _thread
 
diff --git a/functools32/functools32.py b/functools32/functools32.py
@@ -17,8 +17,8 @@
 from weakref import proxy as _proxy
 import sys as _sys
 try:
-    from _thread import allocate_lock as Lock
-except:
+    from thread import allocate_lock as Lock
+except ImportError:
     from ._dummy_thread32 import allocate_lock as Lock
 
 ################################################################################
diff --git a/functools32/reprlib32.py b/functools32/reprlib32.py
@@ -5,7 +5,7 @@
 import __builtin__ as builtins
 from itertools import islice
 try:
-    from _thread import get_ident
+    from thread import get_ident
 except ImportError:
     from _dummy_thread32 import get_ident
 
diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@ def main():
 
     setup(
       name='functools32',
-      version='3.2.3-1',
+      version='3.2.3-2',
       description='Backport of the functools module from Python 3.2.3 for use on 2.7 and PyPy.',
       long_description="""
 This is a backport of the functools standard library module from
