Python3 support

.travis.yml

@@ -1,4 +1,6 @@
 language: python
 python:
     - "2.7"
+    - "3.2"
+    - "3.3"
 script: python -m unittest discover

redis_collections/base.py

@@ -4,16 +4,16 @@
 ~~~~
 """
 
-
 import uuid
 import redis
 import functools
+import six
 from abc import ABCMeta, abstractmethod
 
 try:
-    import cPickle as pickle
+    from six.moves import pickle  # cPikle
 except ImportError:
-    import pickle as pickle  # NOQA
+    import pickle  # NOQA
 
 
 def same_types(fn):
@@ -43,13 +43,11 @@ def wrapper(self, *args):
     return wrapper
 
 
-class RedisCollection:
+class RedisCollection(six.with_metaclass(ABCMeta)):
     """Abstract class providing backend functionality for all the other
     Redis collections.
     """
 
-    __metaclass__ = ABCMeta
-
     _same_types = ()
 
     not_impl_msg = ('Cannot be implemented efficiently or atomically '
@@ -210,7 +208,7 @@ def _pickle(self, data):
         :type data: anything serializable
         :rtype: string
         """
-        return str(self.pickler.dumps(data))
+        return self.pickler.dumps(data)
 
     def _unpickle(self, string):
         """Converts given string serialization back to corresponding data.
@@ -222,7 +220,7 @@ def _unpickle(self, string):
         """
         if string is None:
             return None
-        if not isinstance(string, basestring):
+        if not isinstance(string, six.binary_type):
             msg = 'Only strings can be unpickled (%r given).' % string
             raise TypeError(msg)
         return self.pickler.loads(string)

redis_collections/dicts.py

@@ -8,9 +8,13 @@
 
 
 import collections
+import six
 
 from .base import RedisCollection, same_types
 
+if six.PY3:
+    xrange = range
+
 
 class Dict(RedisCollection, collections.MutableMapping):
     """Mutable **mapping** collection aiming to have the same API as the
@@ -366,7 +370,7 @@ def __init__(self, *args, **kwargs):
         super(Counter, self).__init__(*args, **kwargs)
 
     def _pickle(self, data):
-        return unicode(int(data))
+        return int(data)
 
     def _unpickle(self, string):
         if string is None:
@@ -378,7 +382,7 @@ def _obj_to_data(self, obj):
         is_mapping = isinstance(obj, collections.Mapping)
 
         data = obj._data() if is_redis else obj
-        return dict(data) if is_mapping else iter(data)
+        return dict(data) if is_mapping else map(six.b, data)
 
     def getmany(self, *keys):
         values = super(Counter, self).getmany(*keys)
@@ -457,7 +461,6 @@ def op_trans(pipe):
 
             c1 = collections.Counter(d1)
             result = fn(c1, d2)
-
             if update:
                 result = c1
 

redis_collections/sets.py

@@ -9,16 +9,15 @@
 
 import itertools
 import collections
+import six
 from abc import ABCMeta, abstractmethod
 
 from .base import RedisCollection, same_types
 
 
-class SetOperation(object):
+class SetOperation(six.with_metaclass(ABCMeta)):
     """Helper class for implementing standard set operations."""
 
-    __metaclass__ = ABCMeta
-
     def __init__(self, s, update=False, flipped=False, return_cls=None):
         """
         :param s: :class:`collections.Set` instance.

requirements.txt

@@ -1 +1,2 @@
 redis
+six

setup.py

@@ -50,7 +50,7 @@
     license=open('LICENSE').read(),
     packages=find_packages(exclude=['tests']),
     include_package_data=True,
-    install_requires=['redis>=2.7.2'],
+    install_requires=['redis>=2.7.2', 'six'],
     zip_safe=False,
     classifiers=(
         'Development Status :: 4 - Beta',