Merge branch 'master' of github.com:andymccurdy/redis-py

andymccurdy · andymccurdy · commit 82a76b8621d9 · 2014-04-07T16:08:30.000-07:00
diff --git a/redis/client.py b/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,
         }
     )
 

Original file line number	Diff line number	Diff line change
`@@ -1688,8 +1688,8 @@ class Redis(StrictRedis):`
`1688`	`1688`	`RESPONSE_CALLBACKS = dict_merge(`
`1689`	`1689`	`StrictRedis.RESPONSE_CALLBACKS,`
`1690`	`1690`	`{`
`1691`		`- 'TTL': lambda r: r != -1 and r or None,`
`1692`		`- 'PTTL': lambda r: r != -1 and r or None,`
	`1691`	`+ 'TTL': lambda r: r >= 0 and r or None,`
	`1692`	`+ 'PTTL': lambda r: r >= 0 and r or None,`
`1693`	`1693`	`}`
`1694`	`1694`	`)`
`1695`	`1695`