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

Do not generate optional path components if they are not specified in url_for()

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-15 10:01:43 +05:30
parent 818d5a9070
commit f07a3b301a
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,15 +143,13 @@ class Route(object):
not_spec = self.required_names - frozenset(kwargs) not_spec = self.required_names - frozenset(kwargs)
if not_spec: if not_spec:
raise RouteError('The required variable(s) %s were not specified for the route: %s' % (','.join(not_spec), self.endpoint.route)) raise RouteError('The required variable(s) %s were not specified for the route: %s' % (','.join(not_spec), self.endpoint.route))
args = self.defaults.copy()
args.update(kwargs)
def quoted(x): def quoted(x):
if not isinstance(x, unicode) and not isinstance(x, bytes): if not isinstance(x, unicode) and not isinstance(x, bytes):
x = unicode(x) x = unicode(x)
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 args.iteritems()} args = {k:quoted(v) for k, v in kwargs.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)