trying to getitem on a key that doesn't exist should raise a KeyError

1 files changed, 12 insertions, 2 deletions

diff --git a/redis/client.py b/redis/client.py
index bddb8c8..744d221 100644
--- a/redis/client.py
+++ b/redis/client.py
@@ -443,10 +443,20 @@ class Redis(threading.local):
 
     def get(self, name):
         """
-        Return the value at key ``name``, or None of the key doesn't exist
+        Return the value at key ``name``, or None if the key doesn't exist
         """
         return self.execute_command('GET', name)
-    __getitem__ = get
+
+    def __getitem__(self, name):
+        """
+        Return the value at key ``name``, raises a KeyError if the key
+        doesn't exist.
+        """
+        _name = self.get(name)
+        if _name:
+            return _name
+        else:
+            raise KeyError(name)
 
     def getbit(self, name, offset):
         "Returns a boolean indicating the value of ``offset`` in ``name``"