Remove six

Author: cunla

fakeredis/_fakesocket.py

@@ -7,7 +7,6 @@
 import time
 
 import redis
-import six
 
 from . import _msgs as msgs
 from ._basefakesocket import BaseFakeSocket
@@ -1518,10 +1517,15 @@ def _convert_lua_result(self, result, nested=True):
             return 1 if result else None
         return result
 
+    def ensure_str(self, s):
+        return (s.decode(encoding='utf-8', errors='replace')
+                if isinstance(s, bytes)
+                else str(s).encode(encoding='utf-8', errors='replace'))
+
     def _check_for_lua_globals(self, lua_runtime, expected_globals):
         actual_globals = set(lua_runtime.globals().keys())
         if actual_globals != expected_globals:
-            unexpected = [six.ensure_str(var, 'utf-8', 'replace')
+            unexpected = [self.ensure_str(var, 'utf-8', 'replace')
                           for var in actual_globals - expected_globals]
             raise SimpleError(msgs.GLOBAL_VARIABLE_MSG.format(", ".join(unexpected)))
 

pyproject.toml

@@ -8,7 +8,7 @@ name = "fakeredis"
 packages = [
     { include = "fakeredis" },
 ]
-version = "1.9.2"
+version = "1.9.3"
 description = "Fake implementation of redis API for testing purposes."
 readme = "README.md"
 keywords = ["redis", "rq", "django-rq", "rq-scheduler"]

test/test_fakeredis6.py

@@ -9,7 +9,6 @@
 import pytest
 import redis
 import redis.client
-import six
 from packaging.version import Version
 from redis.exceptions import ResponseError
 
@@ -3001,7 +3000,7 @@ def test_pipeline_raises_when_watched_key_changed(r):
     p = r.pipeline()
     try:
         p.watch('greet', 'foo')
-        nextf = six.ensure_binary(p.get('foo')) + b'baz'
+        nextf = bytes(p.get('foo')) + b'baz'
         # Simulate change happening on another thread.
         r.rpush('greet', 'world')
         # Begin pipelining.
@@ -3022,7 +3021,7 @@ def test_pipeline_succeeds_despite_unwatched_key_changed(r):
     try:
         # Only watch one of the 2 keys.
         p.watch('foo')
-        nextf = six.ensure_binary(p.get('foo')) + b'baz'
+        nextf = bytes(p.get('foo')) + b'baz'
         # Simulate change happening on another thread.
         r.rpush('greet', 'world')
         p.multi()
@@ -3042,7 +3041,7 @@ def test_pipeline_succeeds_when_watching_nonexistent_key(r):
     try:
         # Also watch a nonexistent key.
         p.watch('foo', 'bam')
-        nextf = six.ensure_binary(p.get('foo')) + b'baz'
+        nextf = bytes(p.get('foo')) + b'baz'
         # Simulate change happening on another thread.
         r.rpush('greet', 'world')
         p.multi()