Merge branch 'master' into ps_fix_releasing_of_connection_not_owned_b…

…y_pool

redis/connection.py

@@ -672,7 +672,7 @@ def pack_commands(self, commands):
             output.append(SYM_EMPTY.join(pieces))
         return output
 
-    def get_protocol(self) -> int or str:
+    def get_protocol(self) -> Union[int, str]:
         return self.protocol
 
     @property