resolve conflict

Signed-off-by: wiseaidev <business@wiseai.dev>
redis · Aug 10, 2022 · 3693e81 · 3693e81
1 parent 42f870d
commit 3693e81
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/aredis_om/model/model.py b/aredis_om/model/model.py
@@ -1196,14 +1196,11 @@ def to_string(s):
         offset = 1  # The first item is the count of total matches.
 
         for i in xrange(1, len(res), step):
-            fields_offset = offset
 
             fields = dict(
-                dict(
-                    izip(
-                        map(to_string, res[i + fields_offset][::2]),
-                        map(to_string, res[i + fields_offset][1::2]),
-                    )
+                zip(
+                    map(to_string, res[i + offset][::2]),
+                    map(to_string, res[i + offset][1::2]),
                 )
             )