Skip to content

Commit d8cfb16

Browse files
committed
Merge branch 'oremj-fix_delete_defaults'
2 parents 6b2edeb + 81cd83d commit d8cfb16

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

ChangeLog

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
* delete() and delete_multi() now default the "time" argument to None,
2+
since the protocol doesn't allow a time in some implementations.
3+
Patch by oremj #27
4+
15
Fri, 31 Jul 2015 11:38:25 -0600 Sean Reifschneider <[email protected]>
26

37
* 1.57 release.

memcache.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ def disconnect_all(self):
456456
for s in self.servers:
457457
s.close_socket()
458458

459-
def delete_multi(self, keys, time=0, key_prefix='', noreply=False):
459+
def delete_multi(self, keys, time=None, key_prefix='', noreply=False):
460460
"""Delete multiple keys in the memcache doing just one query.
461461
462462
>>> notset_keys = mc.set_multi({'a1' : 'val1', 'a2' : 'val2'})
@@ -530,7 +530,7 @@ def delete_multi(self, keys, time=0, key_prefix='', noreply=False):
530530
rc = 0
531531
return rc
532532

533-
def delete(self, key, time=0, noreply=False):
533+
def delete(self, key, time=None, noreply=False):
534534
'''Deletes a key from the memcache.
535535
536536
@return: Nonzero on success.
@@ -868,7 +868,7 @@ def set_multi(self, mapping, time=0, key_prefix='', min_compress_len=0,
868868
sending to memcache. Allows you to efficiently stuff these
869869
keys into a pseudo-namespace in memcache:
870870
871-
>>> notset_keys = mc.set_multi(
871+
>> notset_keys = mc.set_multi(
872872
... {'key1' : 'val1', 'key2' : 'val2'},
873873
... key_prefix='subspace_')
874874
>>> len(notset_keys) == 0

0 commit comments

Comments
 (0)