From bfc65f8eca1d35f9ecf73aad08c0d0780bb2bf54 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Mon, 21 Nov 2011 11:17:41 -0500 Subject: get rid of NameError for LockError, use util.threading instead of a conditional import in readwrite_lock --- dogpile/dogpile.py | 2 +- dogpile/readwrite_lock.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'dogpile') 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. -- cgit v1.2.1