Skip to content

Fixed the path portion of URLs that included a database identifier #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
klpauba wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed the path portion of URLs that included a database identifier #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions kyototycoon/kt_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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()
Expand All @@ -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)

Expand Down Expand Up @@ -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()
Expand All @@ -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)

Expand Down