'revoke' now throws a KeyError on invalid revokation keys; otherwise …

…True

shorten/__init__.py

@@ -1,7 +1,7 @@
 from . import keygens
 from . import keystores
 
-__version__ = '0.2.2'
+__version__ = '0.2.3'
 __all__ = ['keygens', 'shortener', 'keystores', '__version__', 'shorteners']
 
 shorteners = ('memcache', 'memory', 'mongo', 'redis', 'redis-bucket', 'sqlalchemy')

shorten/keystores.py

@@ -77,7 +77,7 @@ def insert_with_revoke(self, val, revoke_key):
     self._acquire()
 
     if revoke_key in self._revokation:
-      raise KeyError('Revokation key already exists.')
+      raise KeyError('Revokation key exists.')
 
     short_key = self.insert(val)
     self._revokation[revoke_key] = short_key
@@ -87,9 +87,19 @@ def insert_with_revoke(self, val, revoke_key):
     return short_key
 
   def revoke(self, revoke_key):
-    short_key = self._revokation[revoke_key]
+    """\
+    Revokes (deletes) the short key associated with the given revokation key `revoke_key`.
+    If `revoke_key` does not exist, throws a KeyError. Otherwise returns True.
+    """
+
+    try:
+      short_key = self._revokation[revoke_key]
+    except KeyError:
+      raise KeyError('Revokation key does not exist.')
+
     del self._data[short_key]
     del self._revokation[revoke_key]
+    return True
 
   def __setitem__(self, key, item):
     self._data[key] = item
@@ -173,15 +183,18 @@ def insert_with_revoke(self, val, revoke_key, pipe=None):
 
       if pipe is None:
         if p.execute()[0] == 0:
-          raise KeyError('Revokation key already exists.')
+          raise KeyError('Revokation key exists.')
       return short_key
     finally:
       if pipe is None:
         p.reset()            
 
   def revoke(self, revoke_key, pipe=None):
     """\
-    Revokes a short key by deleting it and associated metadata from Redis.
+    Revokes (deletes) the short key associated with the given revokation key `revoke_key`.
+    If `revoke_key` does not exist, throws a KeyError. Otherwise returns True.  
+
+    If a Redis pipeline is given, no value is returned.
     """
 
     p = self._redis.pipeline() if pipe is None else pipe   
@@ -193,7 +206,10 @@ def revoke(self, revoke_key, pipe=None):
       p.delete(short_key, revoke_key)
 
       if pipe is None:
-        p.execute()    
+        if p.execute()[-1] == 0:
+          raise KeyError('Revokation key does not exist.')
+        else:
+          return True
     except redis.WatchError:
       raise
     finally: