- add in-place py3k compat

7 files changed, 12 insertions, 18 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
 
diff --git a/setup.py b/setup.py
index 2ef2e17..3a5b28b 100644
--- a/setup.py
+++ b/setup.py
@@ -4,12 +4,6 @@ import re
 
 from setuptools import setup, find_packages
 
-extra = {}
-if sys.version_info >= (3, 0):
-    extra.update(
-        use_2to3=True,
-    )
-
 v = open(os.path.join(os.path.dirname(__file__), 'dogpile', 'core', '__init__.py'))
 VERSION = re.compile(r".*__version__ = '(.*?)'", re.S).match(v.read()).group(1)
 v.close()
@@ -38,5 +32,4 @@ setup(name='dogpile.core',
       install_requires=[],
       test_suite='nose.collector',
       tests_require=['nose'],
-      **extra
 )
diff --git a/tests/core/test_nameregistry.py b/tests/core/test_nameregistry.py
index 73bcbfb..59c5a65 100644
--- a/tests/core/test_nameregistry.py
+++ b/tests/core/test_nameregistry.py
@@ -26,8 +26,8 @@ class NameRegistryTest(TestCase):
         }
 
         def do_something(name):
-            for iteration in xrange(20):
-                name = baton.keys()[random.randint(0, 2)]
+            for iteration in range(20):
+                name = list(baton)[random.randint(0, 2)]
                 lock = registry.get(name)
                 lock.acquire()
                 try: