Change RedisModel.from_redis to Python 3 syntax from six; Format code

Author: moznuy

Diff for: aredis_om/model/model.py

@@ -1179,14 +1179,10 @@ def find(cls, *expressions: Union[Any, Expression]) -> FindQuery:
     @classmethod
     def from_redis(cls, res: Any):
         # TODO: Parsing logic copied from redisearch-py. Evaluate.
-        import six
-        from six.moves import xrange
-        from six.moves import zip as izip
-
         def to_string(s):
-            if isinstance(s, six.string_types):
+            if isinstance(s, str):
                 return s
-            elif isinstance(s, six.binary_type):
+            elif isinstance(s, bytes):
                 return s.decode("utf-8", "ignore")
             else:
                 return s  # Not a string we care about
@@ -1195,12 +1191,12 @@ def to_string(s):
         step = 2  # Because the result has content
         offset = 1  # The first item is the count of total matches.
 
-        for i in xrange(1, len(res), step):
+        for i in range(1, len(res), step):
             fields_offset = offset
 
             fields = dict(
                 dict(
-                    izip(
+                    zip(
                         map(to_string, res[i + fields_offset][::2]),
                         map(to_string, res[i + fields_offset][1::2]),
                     )

Diff for: tests/test_hash_model.py

@@ -25,6 +25,7 @@
 from redis_om import has_redisearch
 from tests.conftest import py_test_mark_asyncio
 
+
 if not has_redisearch():
     pytestmark = pytest.mark.skip
 

Diff for: tests/test_json_model.py

@@ -27,6 +27,7 @@
 from redis_om import has_redis_json
 from tests.conftest import py_test_mark_asyncio
 
+
 if not has_redis_json():
     pytestmark = pytest.mark.skip