diff options
Diffstat (limited to 'dogpile/core')
| -rw-r--r-- | dogpile/core/__init__.py | 6 | ||||
| -rw-r--r-- | dogpile/core/dogpile.py | 4 | ||||
| -rw-r--r-- | dogpile/core/nameregistry.py | 2 | ||||
| -rw-r--r-- | dogpile/core/readwrite_lock.py | 2 | ||||
| -rw-r--r-- | dogpile/core/util.py | 5 |
5 files changed, 10 insertions, 9 deletions
diff --git a/dogpile/core/__init__.py b/dogpile/core/__init__.py index e91889d..07cb6cf 100644 --- a/dogpile/core/__init__.py +++ b/dogpile/core/__init__.py @@ -1,6 +1,6 @@ -from dogpile import Dogpile, SyncReaderDogpile, NeedRegenerationException -from nameregistry import NameRegistry -from readwrite_lock import ReadWriteMutex +from .dogpile import Dogpile, SyncReaderDogpile, NeedRegenerationException +from .nameregistry import NameRegistry +from .readwrite_lock import ReadWriteMutex __all__ = 'Dogpile', 'SyncReaderDogpile', 'NeedRegenerationException', 'NameRegistry', 'ReadWriteMutex' diff --git a/dogpile/core/dogpile.py b/dogpile/core/dogpile.py index 84360ef..b735c48 100644 --- a/dogpile/core/dogpile.py +++ b/dogpile/core/dogpile.py @@ -1,7 +1,7 @@ -from util import threading +from .util import threading import time import logging -from readwrite_lock import ReadWriteMutex +from .readwrite_lock import ReadWriteMutex log = logging.getLogger(__name__) diff --git a/dogpile/core/nameregistry.py b/dogpile/core/nameregistry.py index ab3ad7b..b3069aa 100644 --- a/dogpile/core/nameregistry.py +++ b/dogpile/core/nameregistry.py @@ -1,4 +1,4 @@ -from util import threading +from .util import threading import weakref class NameRegistry(object): diff --git a/dogpile/core/readwrite_lock.py b/dogpile/core/readwrite_lock.py index da83215..1ea25e4 100644 --- a/dogpile/core/readwrite_lock.py +++ b/dogpile/core/readwrite_lock.py @@ -1,4 +1,4 @@ -from util import threading +from .util import threading import logging log = logging.getLogger(__name__) diff --git a/dogpile/core/util.py b/dogpile/core/util.py index ac40554..f53c681 100644 --- a/dogpile/core/util.py +++ b/dogpile/core/util.py @@ -1,7 +1,8 @@ +import sys +py3k = sys.version_info >= (3, 0) + try: import threading - import thread except ImportError: import dummy_threading as threading - import dummy_thread as thread |