qmsk.irclogs: comparison sites/irclogs.qmsk.net/urltree.py

equal deleted inserted replaced

-:5a72c00c4ae4
+:fc11c4e86a82
 # built-in type codes
 BUILTIN_TYPES = {
 # default
 None    : str,
+# string
+'str'   : str,
 # integer
 'int'   : int,
 }
 type = None
 # parse key
 key = query_item
+# type
+type = self.config.type_dict[type]
 # add to query_args as (type, default) tuple
-self.query_args[key] = (self.config.type_dict[type], default)
+self.query_args[key] = (type, type(default) if default else default)
 def get_label_path (self) :
 """
 Returns a list containing the labels in this url
 """
 # then add all the values
 for label_value in label_values :
 kwargs[label_value.label.key] = label_value.value
 # then parse all query args
-# XXX: catch missing arguments
 for key, value in request.get_args() :
 # lookup spec
 type, default = self.query_args[key]
 # normalize empty value to None
 # otherwise, fail
 raise URLError("No value given for required argument: %r" % (key, ))
 # set key
 kwargs[key] = value
+# then check all query args
+for key, (type, default) in self.query_args.iteritems() :
+# skip those already present
+if key in kwargs :
+continue
+# apply default?
+if default is None :
+raise URLError("Missing required argument: %r" % (key, ))
+elif default == '' :
+# skip empty default
+continue
+else :
+# set default
+kwargs[key] = default
 # execute the handler
 return self.handler(request, **kwargs)
 def build (self, request, **values) :