Run pyupgrade --py3-only

.gitignore

@@ -2,6 +2,7 @@
 
 # Packages
 *.egg
+*.eggs
 *.egg-info
 dist
 build

redis_collections/base.py

@@ -14,11 +14,11 @@
 import redis
 import six
 
-NUMERIC_TYPES = six.integer_types + (float, Decimal, Fraction, complex)
+NUMERIC_TYPES = (int,) + (float, Decimal, Fraction, complex)
 
 
 @six.add_metaclass(abc.ABCMeta)
-class RedisCollection(object):
+class RedisCollection:
     """Abstract class providing backend functionality for all the other
     Redis collections.
     """
@@ -99,7 +99,7 @@ def _pickle_2(self, data):
         # byte strings. This method encodes unicode types to str to help match
         # Python's behavior.
         # The length of {b'a', u'a'} is 1 on Python 2.x and 2 on Python 3.x
-        if isinstance(data, six.text_type):
+        if isinstance(data, str):
             data = data.encode('utf-8')
 
         return self._pickle_3(data)
@@ -133,7 +133,7 @@ def _unpickle_2(self, string):
         # Because we encoded text data in the pickle method, we should decode
         # it on the way back out
         data = pickle.loads(string) if string else None
-        if isinstance(data, six.binary_type):
+        if isinstance(data, bytes):
             try:
                 data = data.decode('utf-8')
             except UnicodeDecodeError:
@@ -262,4 +262,4 @@ def _repr_data(self):
     def __repr__(self):
         cls_name = self.__class__.__name__
         data = self._repr_data()
-        return '<redis_collections.%s at %s %s>' % (cls_name, self.key, data)
+        return '<redis_collections.{} at {} {}>'.format(cls_name, self.key, data)

redis_collections/dicts.py

@@ -49,7 +49,7 @@ class Dict(RedisCollection, collections_abc.MutableMapping):
 
     _pickle_value = RedisCollection._pickle_3
 
-    class __missing_value(object):
+    class __missing_value:
         def __repr__(self):
             # Specified here so that the documentation shows a useful string
             # for methods that take __marker as a keyword argument
@@ -90,7 +90,7 @@ def __init__(self, *args, **kwargs):
         """
         data = args[0] if args else kwargs.pop('data', None)
         writeback = kwargs.pop('writeback', False)
-        super(Dict, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.writeback = writeback
         self.cache = {}
@@ -106,7 +106,7 @@ def __len__(self, pipe=None):
     def __iter__(self, pipe=None):
         """Return an iterator over the keys of the dictionary."""
         pipe = self.redis if pipe is None else pipe
-        for k, v in six.iteritems(self._data(pipe)):
+        for k, v in self._data(pipe).items():
             yield k
 
     def __contains__(self, key):
@@ -204,7 +204,7 @@ def _data(self, pipe=None):
         (without checking the local cache).
         """
         pipe = self.redis if pipe is None else pipe
-        items = six.iteritems(pipe.hgetall(self.key))
+        items = pipe.hgetall(self.key).items()
 
         return {self._unpickle_key(k): self._unpickle(v) for k, v in items}
 
@@ -215,7 +215,7 @@ def items(self, pipe=None):
     def iteritems(self, pipe=None):
         """Return an iterator over the dictionary's ``(key, value)`` pairs."""
         pipe = self.redis if pipe is None else pipe
-        for k, v in six.iteritems(self._data(pipe)):
+        for k, v in self._data(pipe).items():
             yield k, self.cache.get(k, v)
 
     def keys(self):
@@ -473,7 +473,7 @@ def __init__(self, *args, **kwargs):
                           method.
         :type writeback: bool
         """
-        super(Counter, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
     def __missing__(self, key):
         return 0
@@ -511,7 +511,7 @@ def _update_helper_trans(pipe):
                 data.update(other)
 
             pickled_data = {}
-            for k, v in six.iteritems(data):
+            for k, v in data.items():
                 pickled_key = self._pickle_key(k)
                 pickled_value = self._pickle_value(op(self.get(k, 0), v))
                 pickled_data[pickled_key] = pickled_value
@@ -565,7 +565,7 @@ def __delitem__(self, key):
         missing values.
         """
         try:
-            super(Counter, self).__delitem__(key)
+            super().__delitem__(key)
         except KeyError:
             pass
 
@@ -601,7 +601,7 @@ def op_trans(pipe):
 
             # Otherwise we need to update `self` in this transaction
             pickled_data = {}
-            for key, value in six.iteritems(result):
+            for key, value in result.items():
                 pickled_key = self._pickle_key(key)
                 pickled_value = self._pickle_value(value)
                 pickled_data[pickled_key] = pickled_value
@@ -714,7 +714,7 @@ def __init__(self, *args, **kwargs):
         else:
             default_factory = None
 
-        super(DefaultDict, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
 
         if default_factory is None:
             pass

redis_collections/lists.py

@@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs):
         """
         data = args[0] if args else kwargs.pop('data', None)
         writeback = kwargs.pop('writeback', False)
-        super(List, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         self.__marker = uuid.uuid4().hex
         self.writeback = writeback
@@ -73,7 +73,7 @@ def _pop_left(self):
 
         if self.writeback:
             value = self.cache.get(0, value)
-            items = six.iteritems(self.cache)
+            items = self.cache.items()
             self.cache = {i - 1: v for i, v in items if i != 0}
 
         return value
@@ -94,7 +94,7 @@ def pop_right_trans(pipe):
                 raise IndexError
             pickled_value = pipe.rpop(self.key)
             value = self.cache.get(cache_index, self._unpickle(pickled_value))
-            items = six.iteritems(self.cache)
+            items = self.cache.items()
             self.cache = {i: v for i, v in items if i != cache_index}
 
             return value
@@ -118,7 +118,7 @@ def pop_middle_trans(pipe):
             if self.writeback:
                 value = self.cache.get(cache_index, value)
                 new_cache = {}
-                for i, v in six.iteritems(self.cache):
+                for i, v in self.cache.items():
                     if i < cache_index:
                         new_cache[i] = v
                     elif i > cache_index:
@@ -416,7 +416,7 @@ def _insert_left(self, value, pipe=None):
         pipe = self.redis if pipe is None else pipe
         pipe.lpush(self.key, self._pickle(value))
         if self.writeback:
-            self.cache = {k + 1: v for k, v in six.iteritems(self.cache)}
+            self.cache = {k + 1: v for k, v in self.cache.items()}
             self.cache[0] = value
 
     def _insert_middle(self, index, value, pipe=None):
@@ -435,7 +435,7 @@ def _insert_middle(self, index, value, pipe=None):
 
         if self.writeback:
             new_cache = {}
-            for i, v in six.iteritems(self.cache):
+            for i, v in self.cache.items():
                 if i < cache_index:
                     new_cache[i] = v
                 elif i >= cache_index:
@@ -583,7 +583,7 @@ def eq_trans(pipe):
             return self._transaction(eq_trans)
 
     def __mul__(self, times):
-        if not isinstance(times, six.integer_types):
+        if not isinstance(times, int):
             raise TypeError
 
         return self._python_cls(self.__iter__()) * times
@@ -592,7 +592,7 @@ def __rmul__(self, times):
         return self.__mul__(times)
 
     def __imul__(self, times):
-        if not isinstance(times, six.integer_types):
+        if not isinstance(times, int):
             raise TypeError
 
         # If multiplying by 1 there's no work to do
@@ -624,7 +624,7 @@ def _repr_data(self):
         return '[{}]'.format(', '.join(items))
 
     def _sync_helper(self, pipe):
-        for i, v in six.iteritems(self.cache):
+        for i, v in self.cache.items():
             pipe.lset(self.key, i, self._pickle(v))
 
         self.cache = {}
@@ -690,34 +690,34 @@ def __init__(self, iterable=None, maxlen=None, **kwargs):
         if iterable is not None:
             kwargs['data'] = iterable
 
-        if (maxlen is not None) and not isinstance(maxlen, six.integer_types):
+        if (maxlen is not None) and not isinstance(maxlen, int):
             raise TypeError('an integer is required')
 
         if (maxlen is not None) and maxlen < 0:
             raise ValueError('maxlen must be non-negative')
 
         self.maxlen = maxlen
-        super(Deque, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
     # Magic methods
 
     def __delitem__(self, index):
         if isinstance(index, slice):
             raise TypeError
 
-        return super(Deque, self).__delitem__(index)
+        return super().__delitem__(index)
 
     def __getitem__(self, index):
         if isinstance(index, slice):
             raise TypeError
 
-        return super(Deque, self).__getitem__(index)
+        return super().__getitem__(index)
 
     def __setitem__(self, index, value):
         if isinstance(index, slice):
             raise TypeError
 
-        return super(Deque, self).__setitem__(index, value)
+        return super().__setitem__(index, value)
 
     # Named methods
 
@@ -734,7 +734,7 @@ def _append_helper(self, value, pipe):
         # Pop from the left
         pipe.lpop(self.key)
         if self.writeback:
-            items = six.iteritems(self.cache)
+            items = self.cache.items()
             self.cache = {i - 1: v for i, v in items if i != 0}
 
     def append(self, value):
@@ -748,7 +748,7 @@ def _appendleft_helper(self, value, pipe):
         # Append on the left
         len_self = pipe.lpush(self.key, self._pickle(value))
         if self.writeback:
-            self.cache = {k + 1: v for k, v in six.iteritems(self.cache)}
+            self.cache = {k + 1: v for k, v in self.cache.items()}
             self.cache[0] = value
 
         # Check the length restriction
@@ -759,7 +759,7 @@ def _appendleft_helper(self, value, pipe):
         pipe.rpop(self.key)
         if self.writeback:
             cache_index = len_self - 1
-            items = six.iteritems(self.cache)
+            items = self.cache.items()
             self.cache = {i: v for i, v in items if i != cache_index}
 
     def appendleft(self, value):
@@ -912,7 +912,7 @@ def __iadd__(self, other):
         return self
 
     def __mul__(self, times):
-        if not isinstance(times, six.integer_types):
+        if not isinstance(times, int):
             raise TypeError
 
         return self._python_cls(self.__iter__(), self.maxlen) * times

redis_collections/sets.py

@@ -49,7 +49,7 @@ def __init__(self, *args, **kwargs):
         :type key: str
         """
         data = args[0] if args else kwargs.pop('data', None)
-        super(Set, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         if data:
             self.update(data)

redis_collections/sortedsets.py

@@ -170,7 +170,7 @@ def __init__(self, *args, **kwargs):
         """
         data = args[0] if args else kwargs.pop('data', None)
 
-        super(SortedSetCounter, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         if data:
             self.update(data)
@@ -395,7 +395,7 @@ class GeoDB(SortedSetBase):
     def __init__(self, *args, **kwargs):
         data = args[0] if args else kwargs.pop('data', None)
 
-        super(GeoDB, self).__init__(**kwargs)
+        super().__init__(**kwargs)
 
         if data:
             self.update(data)

redis_collections/syncable.py

@@ -34,7 +34,7 @@
 from .sets import Set
 
 
-class _SyncableBase(object):
+class _SyncableBase:
     @property
     def redis(self):
         return self.persistence.redis
@@ -62,7 +62,7 @@ class SyncableDict(_SyncableBase, dict):
     def __init__(self, **kwargs):
         self.persistence = Dict(**kwargs)
 
-        super(SyncableDict, self).__init__()
+        super().__init__()
         self.update(self.persistence)
 
     def sync(self):
@@ -83,7 +83,7 @@ class SyncableCounter(_SyncableBase, collections.Counter):
     def __init__(self, **kwargs):
         self.persistence = Counter(**kwargs)
 
-        super(SyncableCounter, self).__init__()
+        super().__init__()
         self.update(self.persistence)
 
     def sync(self):
@@ -104,7 +104,7 @@ class SyncableDefaultDict(_SyncableBase, collections.defaultdict):
     def __init__(self, *args, **kwargs):
         self.persistence = DefaultDict(*args, **kwargs)
 
-        super(SyncableDefaultDict, self).__init__(args[0] if args else None)
+        super().__init__(args[0] if args else None)
         self.update(self.persistence)
 
     def sync(self):
@@ -124,7 +124,7 @@ class SyncableList(_SyncableBase, list):
     def __init__(self, **kwargs):
         self.persistence = List(**kwargs)
 
-        super(SyncableList, self).__init__()
+        super().__init__()
         self.extend(self.persistence)
 
     def sync(self):
@@ -144,7 +144,7 @@ class SyncableDeque(_SyncableBase, collections.deque):
     def __init__(self, iterable=None, maxlen=None, **kwargs):
         self.persistence = Deque(iterable=iterable, maxlen=maxlen, **kwargs)
 
-        super(SyncableDeque, self).__init__(maxlen=self.persistence.maxlen)
+        super().__init__(maxlen=self.persistence.maxlen)
         self.extend(self.persistence)
 
     def sync(self):
@@ -164,7 +164,7 @@ class SyncableSet(_SyncableBase, set):
     def __init__(self, **kwargs):
         self.persistence = Set(**kwargs)
 
-        super(SyncableSet, self).__init__()
+        super().__init__()
         self.update(self.persistence)
 
     def sync(self):
@@ -205,7 +205,7 @@ def __init__(self, maxsize=None, **kwargs):
         self.cache = collections.OrderedDict()
         self.persistence = Dict(**kwargs)
 
-        super(LRUDict, self).__init__()
+        super().__init__()
         self.update(self.persistence)
 
     def __contains__(self, key):