Merge pull request #124 from melund/master

Fix bug where dummy_thread was always imported

Author: edschofield

src/_thread/__init__.py

@@ -3,7 +3,10 @@
 __future_module__ = True
 
 if sys.version_info[0] < 3:
-    from dummy_thread import *
+    try:
+        from thread import *
+    except ImportError:
+        from dummy_thread import *
 else:
     raise ImportError('This package should not be accessible on Python 3. '
                       'Either you are trying to run from the python-future src folder '