diff --git a/kyototycoon/kt_http.py b/kyototycoon/kt_http.py index 58cc8cb..b040c99 100644 --- a/kyototycoon/kt_http.py +++ b/kyototycoon/kt_http.py @@ -386,12 +386,11 @@ def get(self, key, db=None): if key is None: return False - path = key + key = quote(key.encode('UTF-8')) if db: - path = '/%s/%s' % (db, key) - path = quote(path.encode('UTF-8')) + key = '/%s/%s' % (quote(db), key) - self.conn.request('GET', path) + self.conn.request('GET', key) res, body = self.getresponse() if res.status == 404: @@ -518,12 +517,11 @@ def get_int(self, key, db=None): self.err.set_error(self.err.LOGIC) return False - path = key + key = quote(key.encode('UTF-8')) if db: - path = '/%s/%s' % (db, key) - path = quote(path.encode('UTF-8')) + key = '/%s/%s' % (quote(db), key) - self.conn.request('GET', path) + self.conn.request('GET', key) res, body = self.getresponse() if res.status != 200: @@ -630,9 +628,9 @@ def set(self, key, value, expire, db): self.err.set_error(self.err.LOGIC) return False - if db: - key = '/%s/%s' % (db, key) key = quote(key.encode('UTF-8')) + if db: + key = '/%s/%s' % (quote(db), key) value = self.pack(value) self.err.set_success() @@ -650,10 +648,10 @@ def add(self, key, value, expire, db): self.err.set_error(self.err.LOGIC) return False + key = quote(key.encode('UTF-8')) if db: - key = '/%s/%s' % (db, key) + key = '/%s/%s' % (quote(db), key) - key = quote(key.encode('UTF-8')) value = self.pack(value) status = self._rest_put('add', key, value, expire) @@ -700,10 +698,10 @@ def remove(self, key, db): self.err.set_error(self.err.LOGIC) return False + key = quote(key.encode('UTF-8')) if db: - key = '/%s/%s' % (db, key) + key = '/%s/%s' % (quote(db), key) - key = quote(key.encode('UTF-8')) self.conn.request('DELETE', key) res, body = self.getresponse() @@ -719,10 +717,10 @@ def replace(self, key, value, expire, db): self.err.set_error(self.err.LOGIC) return False + key = quote(key.encode('UTF-8')) if db: - key = '/%s/%s' % (db, key) + key = '/%s/%s' % (quote(db), key) - key = quote(key.encode('UTF-8')) value = self.pack(value) status = self._rest_put('replace', key, value, expire)