HGETALL returns empty dict instead of None when there's no key in redis

2 files changed, 2 insertions, 2 deletions

diff --git a/redis/client.py b/redis/client.py
index a696e2b..c4ea8db 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -219,7 +219,7 @@ class Redis(threading.local):
             'BGREWRITEAOF': lambda r: \
                 r == 'Background rewriting of AOF file started',
             'BGSAVE': lambda r: r == 'Background saving started',
-            'HGETALL': lambda r: r and pairs_to_dict(r) or None,
+            'HGETALL': lambda r: r and pairs_to_dict(r) or {},
             'INFO': parse_info,
             'LASTSAVE': timestamp_to_datetime,
             'PING': lambda r: r == 'PONG',
diff --git a/tests/server_commands.py b/tests/server_commands.py
index e90d680..99b99d7 100644
--- a/tests/server_commands.py
+++ b/tests/server_commands.py
@@ -767,7 +767,7 @@ class ServerCommandsTestCase(unittest.TestCase):
         self.assertRaises(redis.ResponseError, self.client.hgetall, 'a')
         del self.client['a']
         # no key
-        self.assertEquals(self.client.hgetall('a'), None)
+        self.assertEquals(self.client.hgetall('a'), {})
         # real logic
         h = {'a1': '1', 'a2': '2', 'a3': '3'}
         self.make_hash('a', h)