Merge branch 'master' into fixing-randomly-failing-test

Author: vladvildanov

redis/_parsers/helpers.py

@@ -396,13 +396,20 @@ def parse_item(item):
         # an O(N) complexity) instead of the command.
         if isinstance(item[3], list):
             result["command"] = space.join(item[3])
-            result["client_address"] = item[4]
-            result["client_name"] = item[5]
+
+            # These fields are optional, depends on environment.
+            if len(item) >= 6:
+                result["client_address"] = item[4]
+                result["client_name"] = item[5]
         else:
             result["complexity"] = item[3]
             result["command"] = space.join(item[4])
-            result["client_address"] = item[5]
-            result["client_name"] = item[6]
+
+            # These fields are optional, depends on environment.
+            if len(item) >= 7:
+                result["client_address"] = item[5]
+                result["client_name"] = item[6]
+
         return result
 
     return [parse_item(item) for item in response]

tests/test_json.py

@@ -1521,8 +1521,8 @@ def test_set_path(client):
 
     root = tempfile.mkdtemp()
     sub = tempfile.mkdtemp(dir=root)
-    jsonfile = tempfile.mktemp(suffix=".json", dir=sub)
-    nojsonfile = tempfile.mktemp(dir=root)
+    jsonfile = tempfile.mkstemp(suffix=".json", dir=sub)[1]
+    nojsonfile = tempfile.mkstemp(dir=root)[1]
 
     with open(jsonfile, "w+") as fp:
         fp.write(json.dumps({"hello": "world"}))