Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-08 02:34:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

...

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-15 16:08:04 +05:30
parent 2d574c2b85
commit 2c0c9eec76
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/calibre/srv/routes.py
View File

@ -168,9 +168,11 @@ class Route(object):
if isinstance(x, unicode): if isinstance(x, unicode):
x = x.encode('utf-8') x = x.encode('utf-8')
return urlquote(x, '') return urlquote(x, '')
args = {k:quoted(v) for k, v in kwargs.iteritems()} args = {k:'' for k in self.defaults}
args.update(kwargs)
args = {k:quoted(v) for k, v in args.iteritems()}
route = self.var_pat.sub(lambda m:'{%s}' % m.group(1).partition('=')[0].lstrip('+'), self.endpoint.route) route = self.var_pat.sub(lambda m:'{%s}' % m.group(1).partition('=')[0].lstrip('+'), self.endpoint.route)
return route.format(**args) return route.format(**args).rstrip('/')
def __str__(self): def __str__(self):
return self.endpoint.route return self.endpoint.route