Merge pull request #1077 from oranagra/fix_info_parsing

Re-fix the recently broken INFO parsing, see #1018

1 files changed, 6 insertions, 2 deletions

diff --git a/redis/client.py b/redis/client.py
index df02f4e..4f08fbd 100755
--- a/redis/client.py
+++ b/redis/client.py
@@ -116,8 +116,12 @@ def parse_info(response):
     for line in response.splitlines():
         if line and not line.startswith('#'):
             if line.find(':') != -1:
-                # support keys that include ':' by using rsplit
-                key, value = line.rsplit(':', 1)
+                # Split, the info fields keys and values.
+                # Note that the value may contain ':'. but the 'host:'
+                # pseudo-command is the only case where the key contains ':'
+                key, value = line.split(':', 1)
+                if key == 'cmdstat_host':
+                    key, value = line.rsplit(':', 1)
                 info[key] = get_value(value)
             else:
                 # if the line isn't splittable, append it to the "__raw__" key