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

Validate the arguments to url_for()

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-15 10:12:32 +05:30
parent f07a3b301a
commit 5dba5f88a4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,7 +105,8 @@ class Route(object):
raise route_error('Cannot have non-optional path components after optional ones') raise route_error('Cannot have non-optional path components after optional ones')
matchers.append((None, p.__eq__)) matchers.append((None, p.__eq__))
self.names = [n for n, m in matchers if n is not None] self.names = [n for n, m in matchers if n is not None]
self.required_names = frozenset(self.names) - frozenset(self.defaults) self.all_names = frozenset(self.names)
self.required_names = self.all_names - frozenset(self.defaults)
argspec = inspect.getargspec(self.endpoint) argspec = inspect.getargspec(self.endpoint)
if len(self.names) + 2 != len(argspec.args) - len(argspec.defaults or ()): if len(self.names) + 2 != len(argspec.args) - len(argspec.defaults or ()):
raise route_error('Function must take %d non-default arguments' % (len(self.names) + 2)) raise route_error('Function must take %d non-default arguments' % (len(self.names) + 2))
@ -140,9 +141,13 @@ class Route(object):
return (args_map[name] for name in self.names) return (args_map[name] for name in self.names)
def url_for(self, **kwargs): def url_for(self, **kwargs):
not_spec = self.required_names - frozenset(kwargs) names = frozenset(kwargs)
not_spec = self.required_names - names
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))
unknown = names - self.all_names
if unknown:
raise RouteError('The variable(s) %s are not part of the route: %s' % (','.join(unknown), self.endpoint.route))
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)