Skip to content

Commit 880fe69

Browse files
authored
Merge pull request #190 from ngnpope/fix-delete-return
delete() return value now is 1 for "DELETED" and 0 for "NOT_FOUND" or server error.
2 parents deac889 + c9a1626 commit 880fe69

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

memcache.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -552,9 +552,9 @@ def delete(self, key, noreply=False):
552552
if noreply:
553553
return 1
554554
line = server.readline()
555-
if line and line.strip() in [b'DELETED', b'NOT_FOUND']:
555+
if line and line.strip() == b'DELETED':
556556
return 1
557-
self.debuglog('delete expected DELETED or NOT_FOUND, got: {!r}'.format(line))
557+
self.debuglog('delete expected DELETED, got: {!r}'.format(line))
558558
except OSError as msg:
559559
if isinstance(msg, tuple):
560560
msg = msg[1]

tests/test_memcache.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ def test_delete(self):
5656
result = self.mc.delete("long")
5757
self.assertEqual(result, True)
5858
self.assertEqual(self.mc.get("long"), None)
59+
result = self.mc.delete("<missing>")
60+
self.assertEqual(result, False)
5961

6062
def test_default(self):
6163
key = "default"

0 commit comments

Comments
 (0)