Removed unrelated fix (touch() method).

memcache.py

@@ -553,7 +553,7 @@ def _deletetouch(self, expected, cmd, key, time=0, noreply=False):
         if not server:
             return 0
         self._statlog(cmd)
-        if time is not None:
+        if time is not None and time != 0:
             headers = str(time)
         else:
             headers = None

tests/test_memcache.py

@@ -5,8 +5,6 @@
 
 import six
 
-import time
-
 import zlib
 
 from memcache import Client, SERVER_MAX_KEY_LENGTH, SERVER_MAX_VALUE_LENGTH  # noqa: H301
@@ -52,33 +50,6 @@ def test_delete(self):
         self.assertEqual(result, True)
         self.assertEqual(self.mc.get("long"), None)
 
-        # Delete with explicit time=0 (can re-set immediately)
-        self.mc.set("my_key", "my_val")
-        self.mc.delete("my_key", time=0)
-        self.assertNotEqual(self.mc.set("my_key", "my_val"), 0)
-
-    def test_touch(self):
-        # Basic operation
-        self.mc.set("my_key", "my_val", time=1)
-        self.mc.touch("my_key", time=3)
-        time.sleep(2)
-        self.assertEqual(self.mc.get("my_key"), "my_val")  # It's been prolonged...
-        time.sleep(2)
-        self.assertEqual(self.mc.get("my_key"), None)  # But finally expires
-
-        # Default time
-        self.mc.set("my_key2", "my_val", time=1)
-        self.mc.touch("my_key2")
-        time.sleep(2)
-        self.assertEqual(self.mc.get("my_key2"), "my_val")
-
-        # Return values
-        self.mc.set("my_key3", "my_val")
-        result = self.mc.touch("my_key3")
-        self.assertNotEqual(result, 0)  # Returns nonzero on success
-        result = self.mc.touch("inexisting_key")
-        self.assertEqual(result, 0)
-
     def test_get_multi(self):
         self.check_setget("gm_a_string", "some random string")
         self.check_setget("gm_an_integer", 42)