summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Reifschneider <jafo@tummy.com>2011-11-27 15:58:48 -0700
committerSean Reifschneider <jafo@tummy.com>2011-11-27 15:58:48 -0700
commitf5b4258403331ac368ab08673b150b461c9dfeac (patch)
treeb0404578dcb8b5be1366cd2b1ccf3ebe75bd8ae9
parente189db68270d0dbd406120269f2e9d233bdfb377 (diff)
downloadpython-memcached-f5b4258403331ac368ab08673b150b461c9dfeac.tar.gz
* Bug #798342: If memcached server sends unknown flag in response for
"get", results in: "UnboundLocalError: local variable 'val' referenced before assignment" Now returns "None" instead. Patch by Sharoon Thomas
-rw-r--r--ChangeLog5
-rw-r--r--memcache.py2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1484b64..d9b1eba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+ * Bug #798342: If memcached server sends unknown flag in response for
+ "get", results in:
+ "UnboundLocalError: local variable 'val' referenced before assignment"
+ Now returns "None" instead. Patch by Sharoon Thomas
+
Mon, 20 Dec 2010 19:14:17 -0700 Sean Reifschneider <jafo@tummy.com>
* Bug #680359: useOldServerHashFunction() is broken. It now correctly
diff --git a/memcache.py b/memcache.py
index 6b001fb..bcc872d 100644
--- a/memcache.py
+++ b/memcache.py
@@ -922,7 +922,7 @@ class Client(local):
val = unpickler.load()
except Exception, e:
self.debuglog('Pickle error: %s\n' % e)
- val = None
+ return None
else:
self.debuglog("unknown flags on get: %x\n" % flags)