readline() returns '' instead of None on dead server.

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 617037e..de99e26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
    * Fixing Bug #509712: "TypeError: 'NoneType' object is unsubscriptable"
      Also fixed some other similar code to not have issues with that.
 
+   * Also related to 509712 and 628339: readline() now returns '' instead
+     of None when a server dies.  This should be safer.  Patch suggested by
+     Denis Otkidach.
+
    * Fixing Bug #628339: Read from server sometimes fails.  Patch by Jeremy
      Cowles.
 
diff --git a/memcache.py b/memcache.py
index f12db11..a384f2e 100644
--- a/memcache.py
+++ b/memcache.py
@@ -1051,7 +1051,7 @@ class _Host(object):
                 self.mark_dead('Connection closed while reading from %s'
                         % repr(self))
                 self.buffer = ''
-                return None
+                return ''
             buf += data
         self.buffer = buf[index+2:]
         return buf[:index]