fix for PythonParser when reading empty strings

2 files changed, 6 insertions, 1 deletions

diff --git a/redis/connection.py b/redis/connection.py
index d005430..2b48e32 100644
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -57,7 +57,7 @@ class PythonParser(object):
             length = int(response)
             if length == -1:
                 return None
-            response = length and self.read(length) or ''
+            response = self.read(length)
             return response
         # multi-bulk response
         elif byte == '*':
diff --git a/tests/server_commands.py b/tests/server_commands.py
index 9d82eac..f3fd524 100644
--- a/tests/server_commands.py
+++ b/tests/server_commands.py
@@ -1009,6 +1009,11 @@ class ServerCommandsTestCase(unittest.TestCase):
         self.assertEqual(self.client.hgetall('foo'), d)
         self.assertRaises(redis.DataError, self.client.hmset, 'foo', {})
 
+    def test_hmset_empty_value(self):
+        d = {'a': '1', 'b': '2', 'c': ''}
+        self.assert_(self.client.hmset('foo', d))
+        self.assertEqual(self.client.hgetall('foo'), d)
+
     def test_hmget(self):
         d = {'a': 1, 'b': 2, 'c': 3}
         self.assert_(self.client.hmset('foo', d))