From 5a42e91decf77a34937fd042edadb917cee6980c Mon Sep 17 00:00:00 2001 From: Jim Rybarski Date: Sun, 16 Jun 2013 11:01:15 -0500 Subject: [PATCH 1/2] fixed bug in get_slabs() --- memcache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/memcache.py b/memcache.py index b38020e..765868a 100644 --- a/memcache.py +++ b/memcache.py @@ -294,7 +294,7 @@ def get_slabs(self): while 1: line = readline() if not line or line.strip() == b'END': break - item = line.split(' ', 2) + item = line.decode('ascii').split(' ', 2) #0 = STAT, 1 = ITEM, 2 = Value slab = item[1].split(':', 2) #0 = items, 1 = Slab #, 2 = Name From 268c4ba94ea82a015df9264b7f32ab36f94940e6 Mon Sep 17 00:00:00 2001 From: Jim Rybarski Date: Sun, 16 Jun 2013 11:45:02 -0500 Subject: [PATCH 2/2] changed some ascii encoding/decoding to utf-8 in get_stats, and also get_slabs for consistency --- memcache.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/memcache.py b/memcache.py index 765868a..789ca84 100644 --- a/memcache.py +++ b/memcache.py @@ -267,13 +267,13 @@ def get_stats(self, stat_args = None): else: s.send_cmd(b'stats ' + str(stat_args).encode('utf-8')) serverData = {} - data.append(( name.encode('ascii'), serverData )) + data.append(( name.encode('utf-8'), serverData )) readline = s.readline while 1: line = readline() if not line or line.strip() == b'END': break - stats = line.decode('ascii').split(' ', 2) - serverData[stats[1].encode('ascii')] = stats[2].encode('ascii') + stats = line.decode('utf-8').split(' ', 2) + serverData[stats[1].encode('utf-8')] = stats[2].encode('utf-8') return(data) @@ -294,7 +294,7 @@ def get_slabs(self): while 1: line = readline() if not line or line.strip() == b'END': break - item = line.decode('ascii').split(' ', 2) + item = line.decode('utf-8').split(' ', 2) #0 = STAT, 1 = ITEM, 2 = Value slab = item[1].split(':', 2) #0 = items, 1 = Slab #, 2 = Name