Merge pull request #10 from agronholm/master

Fixed Python 3 compatibility, packaging and code style problems

MANIFEST.in

@@ -1 +1,2 @@
-recursive-include redlock *
+include LICENSE.txt
+recursive-include tests *.py

redlock/__init__.py

@@ -1,9 +1,12 @@
-import redis
 import string
 import random
 import time
 from collections import namedtuple
 
+import redis
+
+# Python 3 compatibility
+string_type = getattr(__builtins__, 'basestring', str)
 
 Lock = namedtuple("Lock", ("validity", "resource", "key"))
 
@@ -28,7 +31,7 @@ def __init__(self, connection_list, retry_count=None, retry_delay=None):
         self.servers = []
         for connection_info in connection_list:
             try:
-                if isinstance(connection_info, basestring):
+                if isinstance(connection_info, string_type):
                     server = redis.StrictRedis.from_url(connection_info)
                 else:
                     server = redis.StrictRedis(**connection_info)

redlock/cli.py

@@ -20,7 +20,6 @@ def lock(name, validity, redis, retry_count=3, retry_delay=200, **kwargs):
         is_blocking = False
 
     while True:
-        err = None
         try:
             dlm = redlock.Redlock(redis, retry_count=retry_count+1, retry_delay=retry_delay / 1000.0)
             lock = dlm.lock(name, validity)

setup.cfg

@@ -0,0 +1,2 @@
+[bdist_wheel]
+universal = 1

setup.py

@@ -1,15 +1,15 @@
 import os
+
 from setuptools import setup, find_packages
 
 # allow setup.py to be run from any path
 os.chdir(os.path.normpath(os.path.join(os.path.abspath(__file__), os.pardir)))
 
-REQUIREMENTS = ["redis"]
-
 README = """
 redlock-py - Redis distributed locks in Python
 
-This python lib implements the Redis-based distributed lock manager algorithm [described in this blog post](http://antirez.com/news/77).
+This python lib implements the Redis-based distributed lock manager algorithm
+[described in this blog post](http://antirez.com/news/77).
 
 To create a lock manager:
 
@@ -37,7 +37,9 @@
 delay (by default 200 milliseconds) used to acquire the lock.
 
 
-**Disclaimer**: This code implements an algorithm which is currently a proposal, it was not formally analyzed. Make sure to understand how it works before using it in your production environments.
+**Disclaimer**: This code implements an algorithm which is currently a proposal,
+it was not formally analyzed. Make sure to understand how it works before using it
+in your production environments.
 
 The MIT License (MIT)
 
@@ -66,18 +68,28 @@
 setup(
     name='redlock-py',
     version='1.0.4',
-    license='MIT',
     packages=find_packages(),
     include_package_data=True,
     description='Redis locking mechanism',
     long_description=README,
     url='https://github.com/SPSCommerce/identity-service',
+    classifiers=[
+        'Development Status :: 5 - Production/Stable',
+        'Intended Audience :: Developers',
+        'License :: OSI Approved :: MIT License',
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
+        'Programming Language :: Python :: 3',
+        'Programming Language :: Python :: 3.2',
+        'Programming Language :: Python :: 3.3',
+        'Programming Language :: Python :: 3.4'
+    ],
     author='pjdecoursey@spscommerce.com',
     author_email='webapps@spscommerce.com',
-    install_requires=REQUIREMENTS,
-    entry_points = {
+    install_requires=["redis"],
+    entry_points={
         'console_scripts': [
             'redlock = redlock.cli:main',
         ],
-    },
+    }
 )

tests/test_redlock.py

@@ -1,4 +1,5 @@
 import unittest
+
 from redlock import Redlock
 
 
@@ -23,7 +24,3 @@ def test_blocked(self):
     def test_bad_connection_info(self):
         with self.assertRaises(Warning):
             Redlock([{"cat": "hog"}])
-
-
-
-