diff options
| author | Andy McCurdy <andy@andymccurdy.com> | 2013-08-23 11:38:10 -0700 |
|---|---|---|
| committer | Andy McCurdy <andy@andymccurdy.com> | 2013-08-23 11:38:10 -0700 |
| commit | eb4354ddeed6dfbd4e7e01857c64ac7697f9a757 (patch) | |
| tree | 9a575fe52e06c51b7a81fa8d92605bf6c7050276 | |
| parent | 0ef65176d2fb1014a1fe8129001642ccff0509ee (diff) | |
| parent | 5353389f469beb43e2c60d75e347002da5572321 (diff) | |
| download | redis-py-eb4354ddeed6dfbd4e7e01857c64ac7697f9a757.tar.gz | |
Merge branch 'lock_timeout' of git://github.com/vitek/redis-py into vitek-lock_timeout
| -rw-r--r-- | redis/client.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/redis/client.py b/redis/client.py index 897ca58..2142a0c 100644 --- a/redis/client.py +++ b/redis/client.py @@ -2109,7 +2109,7 @@ class Lock(object): sleep = self.sleep timeout = self.timeout while 1: - unixtime = int(mod_time.time()) + unixtime = mod_time.time() if timeout: timeout_at = unixtime + timeout else: |