fixes for threadless python compiles

diff --git a/lib/sqlalchemy/pool.py b/lib/sqlalchemy/pool.py
index 6b96d88ead5db61e1e2db9b67d42c3c67c615660..f601dd9a2c83c0c4b6afeec2b4aecc3b81a3522b 100644 (file)
--- a/lib/sqlalchemy/pool.py
+++ b/lib/sqlalchemy/pool.py
@@ -17,7 +17,7 @@ import sqlalchemy.queue as Queue
 try:
     import thread
 except:
-    import dummythread as thread
+    import dummy_thread as thread
 
 proxies = {}
 

diff --git a/lib/sqlalchemy/util.py b/lib/sqlalchemy/util.py
index 1c69f06c9c1034916452f8a8c5bdf5de6428248d..1778966d4bc02b6bf1a9fa11d4a244c9c6f986fc 100644 (file)
--- a/lib/sqlalchemy/util.py
+++ b/lib/sqlalchemy/util.py
@@ -4,7 +4,13 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-import thread, threading, weakref, UserList, time, string, inspect, sys, sets
+import weakref, UserList, time, string, inspect, sys, sets
+try:
+    import thread, threading
+except ImportError:
+    import dummy_thread as thread
+    import dummy_threading as threading
+
 from exceptions import *
 import __builtin__
 
@@ -296,4 +302,4 @@ def constructor_args(instance, **kwargs):
                 raise AssertionError("instance has no attribute '%s'" % arg)
 
     return newparams
-    
\ No newline at end of file
+