make code more compact

Signed-off-by: wiseaidev <[email protected]>

aredis_om/checks.py

@@ -7,14 +7,12 @@
 @lru_cache(maxsize=None)
 async def check_for_command(conn, cmd):
     cmd_info = await conn.execute_command("command", "info", cmd)
-    return None not in cmd_info
+    return all(cmd_info)
 
 
 @lru_cache(maxsize=None)
 async def has_redis_json(conn=None):
-    if not conn:
-        conn = get_redis_connection()
-    command_exists = await check_for_command(conn, "json.set")
+    command_exists = await check_for_command(conn or get_redis_connection(), "json.set")
     return command_exists
 
 

aredis_om/connections.py

@@ -9,11 +9,9 @@
 def get_redis_connection(**kwargs) -> aioredis.Redis:
     # If someone passed in a 'url' parameter, or specified a REDIS_OM_URL
     # environment variable, we'll create the Redis client from the URL.
-    url = kwargs.pop("url", URL)
-    if url:
-        return aioredis.Redis.from_url(url, **kwargs)
-
+    if not kwargs.get("url", None) and URL:
+        kwargs["url"] = URL
     # Decode from UTF-8 by default
-    if "decode_responses" not in kwargs:
+    if not kwargs.get("decode_responses", None):
         kwargs["decode_responses"] = True
-    return aioredis.Redis(**kwargs)
+    return aioredis.from_url(**kwargs)

aredis_om/model/model.py

@@ -1195,12 +1195,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 range(1, len(res), step):
+        for i in xrange(1, len(res), step):
             fields_offset = offset
 
             fields = dict(
                 dict(
-                    zip(
+                    izip(
                         map(to_string, res[i + fields_offset][::2]),
                         map(to_string, res[i + fields_offset][1::2]),
                     )