Merge pull request redis#442 from mkai/_ttl_pttl

Adjust to changed TTL, PTTL semantics

Author: andymccurdy

redis/client.py

@@ -1688,8 +1688,8 @@ class Redis(StrictRedis):
     RESPONSE_CALLBACKS = dict_merge(
         StrictRedis.RESPONSE_CALLBACKS,
         {
-            'TTL': lambda r: r != -1 and r or None,
-            'PTTL': lambda r: r != -1 and r or None,
+            'TTL': lambda r: r >= 0 and r or None,
+            'PTTL': lambda r: r >= 0 and r or None,
         }
     )