txredisapi 1.4.12__tar.gz → 1.5.0__tar.gz

{txredisapi-1.4.12/txredisapi.egg-info → txredisapi-1.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: txredisapi
-Version: 1.4.12
+Version: 1.5.0
 Summary: non-blocking redis client for python
 Home-page: http://github.com/IlyaSkriblovsky/txredisapi
 Author: Alexandre Fiori
@@ -11,7 +11,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
@@ -20,10 +19,21 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: twisted
-Requires-Dist: six
+Requires-Dist: twisted[tls]
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 txredisapi
 ==========

{txredisapi-1.4.12 → txredisapi-1.5.0}/setup.py

@@ -23,9 +23,10 @@ long_description = (this_directory / "README.md").read_text()
 
 setuptools.setup(
     name="txredisapi",
-    version="1.4.12",
+    version="1.5.0",
     py_modules=["txredisapi"],
-    install_requires=["twisted", "six"],
+    install_requires=["twisted[tls]"],
+    python_requires=">=3.5",
     author="Alexandre Fiori",
     author_email="fiorix@gmail.com",
     url="http://github.com/IlyaSkriblovsky/txredisapi",
@@ -39,7 +40,6 @@ setuptools.setup(
         'Operating System :: OS Independent',
         'License :: OSI Approved :: Apache Software License',
         'Programming Language :: Python',
-        'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3.5',
         'Programming Language :: Python :: 3.6',
         'Programming Language :: Python :: 3.7',

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_bitops.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 import sys
 import operator
 
@@ -48,7 +46,7 @@ class TestBitOps(unittest.TestCase, Redis26CheckMixin):
     @defer.inlineCallbacks
     def test_getbit(self):
         key = self._KEYS[0]
-        yield self.db.set(key, six.b('\xaa'))
+        yield self.db.set(key, b'\xaa')
         l = [1, 0, 1, 0, 1, 0, 1, 0]
         for x in range(8):
             r = yield self.db.getbit(key, x)
@@ -86,30 +84,30 @@ class TestBitOps(unittest.TestCase, Redis26CheckMixin):
     def test_bitop_not(self):
         return self._test_bitop([operator.__not__, operator.not_,
                                  'not', 'NOT', 'NoT'],
-                                six.b('\x0f\x0f\x0f\x0f'),
+                                b'\x0f\x0f\x0f\x0f',
                                 None,
-                                six.b('\xf0\xf0\xf0\xf0'))
+                                b'\xf0\xf0\xf0\xf0')
 
     def test_bitop_or(self):
         return self._test_bitop([operator.__or__, operator.or_,
                                  'or', 'OR', 'oR'],
-                                six.b('\x0f\x0f\x0f\x0f'),
-                                six.b('\xf0\xf0\xf0\xf0'),
-                                six.b('\xff\xff\xff\xff'))
+                                b'\x0f\x0f\x0f\x0f',
+                                b'\xf0\xf0\xf0\xf0',
+                                b'\xff\xff\xff\xff')
 
     def test_bitop_and(self):
         return self._test_bitop([operator.__and__, operator.and_,
                                  'and', 'AND', 'AnD'],
-                                six.b('\x0f\x0f\x0f\x0f'),
-                                six.b('\xf0\xf0\xf0\xf0'),
-                                six.b('\x00\x00\x00\x00'))
+                                b'\x0f\x0f\x0f\x0f',
+                                b'\xf0\xf0\xf0\xf0',
+                                b'\x00\x00\x00\x00')
 
     def test_bitop_xor(self):
         return self._test_bitop([operator.__xor__, operator.xor,
                                  'xor', 'XOR', 'XoR'],
-                                six.b('\x9c\x9c\x9c\x9c'),
-                                six.b('\x6c\x6c\x6c\x6c'),
-                                six.b('\xf0\xf0\xf0\xf0'))
+                                b'\x9c\x9c\x9c\x9c',
+                                b'\x6c\x6c\x6c\x6c',
+                                b'\xf0\xf0\xf0\xf0')
 
     def test_bitop_invalid(self):
         self.assertFailure(self.db.bitop('test', 'test', 'test'),

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_connection_charset.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 from twisted.internet import defer
 from twisted.trial import unittest
 
@@ -25,7 +23,7 @@ from tests.mixins import REDIS_HOST, REDIS_PORT
 
 class TestConnectionCharset(unittest.TestCase):
     TEST_KEY = 'txredisapi:test_key'
-    TEST_VALUE_UNICODE = six.text_type('\u262d' * 3)
+    TEST_VALUE_UNICODE = str('\u262d' * 3)
     TEST_VALUE_BINARY = b'\x00\x01' * 3
 
     @defer.inlineCallbacks
@@ -34,7 +32,7 @@ class TestConnectionCharset(unittest.TestCase):
 
         yield db.set(self.TEST_KEY, self.TEST_VALUE_BINARY)
         result = yield db.get(self.TEST_KEY)
-        self.assertTrue(type(result) == six.binary_type)
+        self.assertTrue(type(result) == bytes)
         self.assertEqual(result, self.TEST_VALUE_BINARY)
 
         yield db.delete(self.TEST_KEY)
@@ -47,7 +45,7 @@ class TestConnectionCharset(unittest.TestCase):
         yield db.set(self.TEST_KEY, self.TEST_VALUE_UNICODE)
         result = yield db.get(self.TEST_KEY)
         self.assertEqual(result, self.TEST_VALUE_UNICODE)
-        self.assertTrue(type(result) == six.text_type)
+        self.assertTrue(type(result) == str)
 
         yield db.delete(self.TEST_KEY)
         yield db.disconnect()

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_hash_ops.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 from twisted.internet import defer
 from twisted.trial import unittest
 
@@ -58,8 +56,8 @@ class TestRedisHashOperations(unittest.TestCase):
         t_dict['key2'] = 'dos'
         yield db.hmset("txredisapi:HKeysHVals", t_dict)
 
-        vs_u = [six.text_type(v) for v in t_dict.values()]
-        ks_u = [six.text_type(k) for k in t_dict.keys()]
+        vs_u = [str(v) for v in t_dict.values()]
+        ks_u = [str(k) for k in t_dict.keys()]
         k_res = yield db.hkeys("txredisapi:HKeysHVals")
         v_res = yield db.hvals("txredisapi:HKeysHVals")
         self.assertEqual(sorted(ks_u), sorted(k_res))

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_multibulk.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 import os
 import base64
 
@@ -61,7 +59,7 @@ class LargeMultiBulk(unittest.TestCase):
     @defer.inlineCallbacks
     def test_bulk_numeric(self):
         test_values = [
-            six.b(''), six.b('.hello'), six.b('+world'), six.b('123test'),
+            b'', b'.hello', b'+world', b'123test',
             +1, 0.1, 0.01, -0.1, 0, -10]
         for v in test_values:
             yield self.db.set(self._KEY, v)
@@ -76,7 +74,7 @@ class LargeMultiBulk(unittest.TestCase):
         if there's a '.' in the string.
         This test is to ensure this behavior isn't broken in the future.
         '''
-        values = [six.b('+inf'), six.b('-inf'), six.b('NaN')]
+        values = [b'+inf', b'-inf', b'NaN']
         for x in values:
             yield self.db.set(self._KEY, x)
             r = yield self.db.get(self._KEY)

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_number_conversions.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 import txredisapi as redis
 from twisted.internet import defer
 from twisted.trial import unittest
@@ -58,7 +56,7 @@ class TestNumberConversions(unittest.TestCase):
                     expected = format(k, "f")
                 else:
                     expected = str(k)
-                self.assertIsInstance(result, six.string_types)
+                self.assertIsInstance(result, str)
                 self.assertEqual(result, expected)
 
     @defer.inlineCallbacks

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_pipelining.py

@@ -15,8 +15,6 @@
 
 import sys
 
-import six
-
 from twisted.trial import unittest
 from twisted.internet import defer
 from twisted.python import log
@@ -71,8 +69,8 @@ class TestRedisConnections(unittest.TestCase):
 
         # Make sure that all SET commands were sent in a single pipelined write.
         write_history = pipeline.transport.write_history
-        lines_in_first_write = write_history[0].split(six.b("\n"))
-        sets_in_first_write = sum(1 for w in lines_in_first_write if six.b("SET") in w)
+        lines_in_first_write = write_history[0].split(b"\n")
+        sets_in_first_write = sum(1 for w in lines_in_first_write if b"SET" in w)
         self.assertEqual(sets_in_first_write, 3)
 
     @defer.inlineCallbacks

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_protocol.py

@@ -13,8 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 import txredisapi as redis
 
 from twisted.trial import unittest
@@ -36,7 +34,7 @@ class LineReceiverSubclass(redis.LineReceiver):
 
 
 class TestLineReciever(unittest.TestCase):
-    S = six.b('TEST')
+    S = b'TEST'
 
     def setUp(self):
         self.proto = LineReceiverSubclass()
@@ -47,14 +45,14 @@ class TestLineReciever(unittest.TestCase):
 
     def test_excess_line_length(self):
         self.assertTrue(self.transport.connected)
-        self.proto.dataReceived(six.b('\x00') * (self.proto.MAX_LENGTH + 1))
+        self.proto.dataReceived(b'\x00' * (self.proto.MAX_LENGTH + 1))
         self.assertFalse(self.transport.connected)
 
     def test_excess_delimited_line(self):
         self.assertTrue(self.transport.connected)
         self.proto.dataReceived(self.S + self.proto.delimiter)
         self.assertEqual(self.proto._rcvd_line, self.S.decode())
-        s = (six.b('\x00') * (self.proto.MAX_LENGTH + 1)) + self.proto.delimiter
+        s = (b'\x00' * (self.proto.MAX_LENGTH + 1)) + self.proto.delimiter
         self.proto._rcvd_line = None
         self.proto.dataReceived(s)
         self.assertFalse(self.transport.connected)
@@ -94,4 +92,4 @@ class TestBaseRedisProtocol(unittest.TestCase):
 
     def test_build_ping(self):
         s = self._protocol._build_command("PING")
-        self.assertEqual(s, six.b('*1\r\n$4\r\nPING\r\n'))
+        self.assertEqual(s, b'*1\r\n$4\r\nPING\r\n')

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_scripting.py

@@ -16,8 +16,6 @@
 import sys
 import hashlib
 
-import six
-
 import txredisapi as redis
 
 from twisted.internet import defer

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_sentinel.py

@@ -1,4 +1,3 @@
-import six
 import sys
 from twisted.internet import defer, reactor
 from twisted.internet.protocol import Factory
@@ -23,12 +22,12 @@ class FakeRedisProtocol(BaseRedisProtocol):
             parts.extend(cls._encode_value(x) for x in value)
             return b''.join(parts)
 
-        if isinstance(value, six.text_type):
+        if isinstance(value, str):
             binary = value.encode("utf-8")
         elif isinstance(value, bytes):
             binary = value
         else:
-            binary = six.text_type(value).encode("utf-8")
+            binary = str(value).encode("utf-8")
         return b''.join([b'$', str(len(binary)).encode('ascii'), b'\r\n', binary, b'\r\n'])
 
     def send_reply(self, reply):

{txredisapi-1.4.12 → txredisapi-1.5.0}/tests/test_subscriber.py

@@ -12,8 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
-
 from twisted.internet import defer, reactor
 from twisted.trial import unittest
 

{txredisapi-1.4.12 → txredisapi-1.5.0/txredisapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: txredisapi
-Version: 1.4.12
+Version: 1.5.0
 Summary: non-blocking redis client for python
 Home-page: http://github.com/IlyaSkriblovsky/txredisapi
 Author: Alexandre Fiori
@@ -11,7 +11,6 @@ Classifier: Intended Audience :: Developers
 Classifier: Operating System :: OS Independent
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 2.7
 Classifier: Programming Language :: Python :: 3.5
 Classifier: Programming Language :: Python :: 3.6
 Classifier: Programming Language :: Python :: 3.7
@@ -20,10 +19,21 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: PyPy
+Requires-Python: >=3.5
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: twisted
-Requires-Dist: six
+Requires-Dist: twisted[tls]
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 txredisapi
 ==========

txredisapi-1.5.0/txredisapi.egg-info/requires.txt

@@ -0,0 +1 @@
+twisted[tls]

{txredisapi-1.4.12 → txredisapi-1.5.0}/txredisapi.py

@@ -22,8 +22,6 @@
 #   Sharding and Consistent Hashing implementation by Gleicon Moraes.
 #
 
-import six
-
 import bisect
 import collections
 import functools
@@ -91,8 +89,8 @@ def list_or_args(command, keys, args):
     oldapi = bool(args)
     try:
         iter(keys)
-        if isinstance(keys, six.string_types) or \
-                isinstance(keys, six.binary_type):
+        if isinstance(keys, str) or \
+                isinstance(keys, bytes):
             keys = [keys]
             if not oldapi:
                 return keys
@@ -140,13 +138,13 @@ class MultiBulkStorage(object):
 class LineReceiver(protocol.Protocol, basic._PauseableMixin):
     callLater = reactor.callLater
     line_mode = 1
-    __buffer = six.b('')
-    delimiter = six.b('\r\n')
+    __buffer = b''
+    delimiter = b'\r\n'
     MAX_LENGTH = 16384
 
     def clearLineBuffer(self):
         b = self.__buffer
-        self.__buffer = six.b('')
+        self.__buffer = b''
         return b
 
     def dataReceived(self, data, unpause=False):
@@ -165,14 +163,14 @@ class LineReceiver(protocol.Protocol, basic._PauseableMixin):
                 line, self.__buffer = self.__buffer.split(self.delimiter, 1)
             except ValueError:
                 if len(self.__buffer) > self.MAX_LENGTH:
-                    line, self.__buffer = self.__buffer, six.b('')
+                    line, self.__buffer = self.__buffer, b''
                     return self.lineLengthExceeded(line)
                 break
             else:
                 linelength = len(line)
                 if linelength > self.MAX_LENGTH:
                     exceeded = line + self.__buffer
-                    self.__buffer = six.b('')
+                    self.__buffer = b''
                     return self.lineLengthExceeded(exceeded)
                 if hasattr(line, 'decode'):
                     why = self.lineReceived(line.decode())
@@ -183,11 +181,11 @@ class LineReceiver(protocol.Protocol, basic._PauseableMixin):
         else:
             if not self.paused:
                 data = self.__buffer
-                self.__buffer = six.b('')
+                self.__buffer = b''
                 if data:
                     return self.rawDataReceived(data)
 
-    def setLineMode(self, extra=six.b('')):
+    def setLineMode(self, extra=b''):
         self.line_mode = 1
         if extra:
             self.pauseProducing()
@@ -203,7 +201,7 @@ class LineReceiver(protocol.Protocol, basic._PauseableMixin):
         raise NotImplementedError
 
     def sendLine(self, line):
-        if isinstance(line, six.text_type):
+        if isinstance(line, str):
             line = line.encode()
         return self.transport.write(line + self.delimiter)
 
@@ -449,7 +447,7 @@ class BaseRedisProtocol(LineReceiver):
 
     def tryConvertData(self, data):
         # The hiredis reader implicitly returns integers
-        if isinstance(data, six.integer_types):
+        if isinstance(data, int):
             return data
         if isinstance(data, list):
             return [self.tryConvertData(x) for x in data]
@@ -458,7 +456,7 @@ class BaseRedisProtocol(LineReceiver):
             if data:
                 num_data = data
                 try:
-                    if isinstance(data, six.binary_type):
+                    if isinstance(data, bytes):
                         num_data = data.decode()
                 except UnicodeError:
                     pass
@@ -537,9 +535,9 @@ class BaseRedisProtocol(LineReceiver):
         return r
 
     def _encode_value(self, arg):
-        if isinstance(arg, six.binary_type):
+        if isinstance(arg, bytes):
             return arg
-        elif isinstance(arg, six.text_type):
+        elif isinstance(arg, str):
             if self.charset is None:
                 try:
                     return arg.encode()
@@ -565,15 +563,15 @@ class BaseRedisProtocol(LineReceiver):
         cmd_count = 0
         for s in args:
             cmd = self._encode_value(s)
-            cmds.extend(six.b("$"))
+            cmds.extend(b"$")
             for token in self._encode_value(len(cmd)), cmd:
                 cmds.extend(token)
-                cmds.extend(six.b("\r\n"))
+                cmds.extend(b"\r\n")
             cmd_count += 1
 
-        command = bytes(six.b("").join(
-            [six.b("*"), self._encode_value(cmd_count), six.b("\r\n")]) + cmds)
-        if not isinstance(command, six.binary_type):
+        command = bytes(b"".join(
+            [b"*", self._encode_value(cmd_count), b"\r\n"]) + cmds)
+        if not isinstance(command, bytes):
             command = command.encode()
         return command
 
@@ -861,7 +859,7 @@ class BaseRedisProtocol(LineReceiver):
         Set the respective keys to the respective values.
         """
         items = []
-        for pair in six.iteritems(mapping):
+        for pair in mapping.items():
             items.extend(pair)
         return self.execute_command("MSET", *items)
 
@@ -871,7 +869,7 @@ class BaseRedisProtocol(LineReceiver):
         operation if none of the keys already exist
         """
         items = []
-        for pair in six.iteritems(mapping):
+        for pair in mapping.items():
             items.extend(pair)
         return self.execute_command("MSETNX", *items)
 
@@ -883,7 +881,7 @@ class BaseRedisProtocol(LineReceiver):
         srclen = len(srckeys)
         if srclen == 0:
             return defer.fail(RedisError("no ``srckeys`` specified"))
-        if isinstance(operation, six.string_types):
+        if isinstance(operation, str):
             operation = operation.upper()
         elif operation is operator.and_ or operation is operator.__and__:
             operation = 'AND'
@@ -1034,7 +1032,7 @@ class BaseRedisProtocol(LineReceiver):
         """
         Blocking LPOP
         """
-        if isinstance(keys, six.string_types):
+        if isinstance(keys, str):
             keys = [keys]
         else:
             keys = list(keys)
@@ -1047,7 +1045,7 @@ class BaseRedisProtocol(LineReceiver):
         """
         Blocking RPOP
         """
-        if isinstance(keys, six.string_types):
+        if isinstance(keys, str):
             keys = [keys]
         else:
             keys = list(keys)
@@ -1215,7 +1213,7 @@ class BaseRedisProtocol(LineReceiver):
 
     @staticmethod
     def _handle_zincrby(data):
-        if isinstance(data, (six.binary_type, six.text_type)):
+        if isinstance(data, (bytes, str)):
             return float(data)
         return data
 
@@ -1330,7 +1328,7 @@ class BaseRedisProtocol(LineReceiver):
 
     @staticmethod
     def _handle_zscore(data):
-        if isinstance(data, (six.binary_type, six.text_type)):
+        if isinstance(data, (bytes, str)):
             return int(data)
         return data
 
@@ -1391,7 +1389,7 @@ class BaseRedisProtocol(LineReceiver):
                 aggregate = 'SUM'
             else:
                 err_flag = True
-                if isinstance(aggregate, six.string_types):
+                if isinstance(aggregate, str):
                     aggregate_u = aggregate.upper()
                     if aggregate_u in ('MIN', 'MAX', 'SUM'):
                         aggregate = aggregate_u
@@ -1437,7 +1435,7 @@ class BaseRedisProtocol(LineReceiver):
         Set the hash fields to their respective values.
         """
         items = []
-        for pair in six.iteritems(mapping):
+        for pair in mapping.items():
             items.extend(pair)
         return self.execute_command("HMSET", key, *items)
 
@@ -1463,7 +1461,7 @@ class BaseRedisProtocol(LineReceiver):
         """
         Remove the specified field or fields from a hash
         """
-        if isinstance(fields, six.string_types):
+        if isinstance(fields, str):
             fields = [fields]
         else:
             fields = list(fields)
@@ -1541,7 +1539,7 @@ class BaseRedisProtocol(LineReceiver):
             self.inMulti = False
             self.unwatch_cc = self._clear_txstate
             self.commit_cc = lambda: ()
-        if isinstance(keys, six.string_types):
+        if isinstance(keys, str):
             keys = [keys]
         d = self.execute_command("WATCH", *keys).addCallback(self._tx_started)
         return d
@@ -1619,7 +1617,7 @@ class BaseRedisProtocol(LineReceiver):
 
         # Flush all the commands at once to redis. Wait for all replies
         # to come back using a deferred list.
-        self.transport.write(six.b("").join(self.pipelined_commands))
+        self.transport.write(b"".join(self.pipelined_commands))
 
         d = defer.DeferredList(
             deferredList=self.pipelined_replies,
@@ -1684,7 +1682,7 @@ class BaseRedisProtocol(LineReceiver):
         return self.execute_command("BGREWRITEAOF")
 
     def _process_info(self, r):
-        if isinstance(r, six.binary_type):
+        if isinstance(r, bytes):
             r = r.decode()
         keypairs = [x for x in r.split('\r\n') if
                     ':' in x and not x.startswith('#')]
@@ -1726,7 +1724,7 @@ class BaseRedisProtocol(LineReceiver):
         return err
 
     def eval(self, script, keys=[], args=[]):
-        if isinstance(script, six.text_type):
+        if isinstance(script, str):
             script = script.encode()
         h = hashlib.sha1(script).hexdigest()
         if h in self.script_hashes:
@@ -1853,7 +1851,7 @@ class HiredisProtocol(BaseRedisProtocol):
             self._reader.feed(data)
         res = self._reader.gets()
         while res is not False:
-            if isinstance(res, (six.text_type, six.binary_type, list)):
+            if isinstance(res, (str, bytes, list)):
                 res = self.tryConvertData(res)
             if res == "QUEUED":
                 self.transactions += 1
@@ -1868,8 +1866,8 @@ class HiredisProtocol(BaseRedisProtocol):
             return [self._convert_bin_values(x) for x in result]
         elif isinstance(result, dict):
             return dict((self._convert_bin_values(k), self._convert_bin_values(v))
-                        for k, v in six.iteritems(result))
-        elif isinstance(result, six.binary_type):
+                        for k, v in result.items())
+        elif isinstance(result, bytes):
             return self.tryConvertData(result)
         return result
 
@@ -1934,22 +1932,22 @@ class SubscriberProtocol(RedisProtocol):
             self.replyQueue.put(reply)
 
     def subscribe(self, channels):
-        if isinstance(channels, six.string_types):
+        if isinstance(channels, str):
             channels = [channels]
         return self.execute_command("SUBSCRIBE", *channels, apply_timeout=False)
 
     def unsubscribe(self, channels):
-        if isinstance(channels, six.string_types):
+        if isinstance(channels, str):
             channels = [channels]
         return self.execute_command("UNSUBSCRIBE", *channels)
 
     def psubscribe(self, patterns):
-        if isinstance(patterns, six.string_types):
+        if isinstance(patterns, str):
             patterns = [patterns]
         return self.execute_command("PSUBSCRIBE", *patterns, apply_timeout=False)
 
     def punsubscribe(self, patterns):
-        if isinstance(patterns, six.string_types):
+        if isinstance(patterns, str):
             patterns = [patterns]
         return self.execute_command("PUNSUBSCRIBE", *patterns)
 
@@ -2093,9 +2091,9 @@ class HashRing(object):
         self.nodes.append(node)
         for x in range(self.replicas):
             uuid = node._factory.uuid
-            if isinstance(uuid, six.text_type):
+            if isinstance(uuid, str):
                 uuid = uuid.encode()
-            crckey = zlib.crc32(six.b(":").join(
+            crckey = zlib.crc32(b":".join(
                 [uuid, str(x).format().encode()]))
             self.ring[crckey] = node
             self.sorted_keys.append(crckey)
@@ -2105,7 +2103,7 @@ class HashRing(object):
     def remove_node(self, node):
         self.nodes.remove(node)
         for x in range(self.replicas):
-            crckey = zlib.crc32(six.b(":").join(
+            crckey = zlib.crc32(b":".join(
                 [node, str(x).format().encode()]))
             self.ring.remove(crckey)
             self.sorted_keys.remove(crckey)
@@ -2160,7 +2158,7 @@ class ShardedConnectionHandler(object):
     def _wrap(self, method, *args, **kwargs):
         try:
             key = args[0]
-            assert isinstance(key, six.string_types)
+            assert isinstance(key, str)
         except:
             raise ValueError(
                 "Method '%s' requires a key as the first argument" % method)
@@ -2195,7 +2193,7 @@ class ShardedConnectionHandler(object):
             group[node].append(k)
 
         deferreds = []
-        for node, keys in six.iteritems(group.items):
+        for node, keys in group.items.items():
             nd = node.mget(keys)
             deferreds.append(nd)
 
@@ -2215,7 +2213,7 @@ class ShardedConnectionHandler(object):
             except:
                 pass
             else:
-                nodes.append(six.b("%s:%s/%d") %
+                nodes.append(b"%s:%s/%d" %
                              (cli.host, cli.port, conn._factory.size))
         return "<Redis Sharded Connection: %s>" % ", ".join(nodes)
 
@@ -2229,7 +2227,7 @@ class ShardedUnixConnectionHandler(ShardedConnectionHandler):
             except:
                 pass
             else:
-                nodes.append(six.b("%s/%d") %
+                nodes.append(b"%s/%d" %
                              (cli.name, conn._factory.size))
         return "<Redis Sharded Connection: %s>" % ", ".join(nodes)
 
@@ -2825,4 +2823,4 @@ __all__ = [
 ]
 
 __author__ = "Alexandre Fiori"
-__version__ = version = "1.4.12"
+__version__ = version = "1.5.0"

txredisapi-1.4.12/txredisapi.egg-info/requires.txt

@@ -1,2 +0,0 @@
-twisted
-six