get rid of NameError for LockError, use util.threading instead of a conditional import in readwrite_lock

2 files changed, 5 insertions, 5 deletions

diff --git a/dogpile/dogpile.py b/dogpile/dogpile.py
index ae90cf8..6f0d290 100644
--- a/dogpile/dogpile.py
+++ b/dogpile/dogpile.py
@@ -1,4 +1,4 @@
-from util import thread, threading
+from util import threading
 import time
 import logging
 from readwrite_lock import ReadWriteMutex
diff --git a/dogpile/readwrite_lock.py b/dogpile/readwrite_lock.py
index 5c1d3fc..175c481 100644
--- a/dogpile/readwrite_lock.py
+++ b/dogpile/readwrite_lock.py
@@ -1,11 +1,11 @@
-try:
-    import threading
-except ImportError:
-    import dummy_threading as threading
+from util import threading
 
 import logging
 log = logging.getLogger(__name__)
 
+class LockError(Exception):
+    pass
+
 class ReadWriteMutex(object):
     """A mutex which allows multiple readers, single writer.