]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Add name parameter for URLSpec in tuple/list format. 926/head
authorLiang Sun <i@liangsun.org>
Mon, 4 Nov 2013 10:03:33 +0000 (18:03 +0800)
committerLiang Sun <i@liangsun.org>
Mon, 4 Nov 2013 10:03:33 +0000 (18:03 +0800)
tornado/web.py

index a19e75f038af6f60f13e458045c0b46e967c7ead..e6598bb04c4f56b1441895369356f9f4249d2ebe 100644 (file)
@@ -1564,15 +1564,8 @@ class Application(object):
 
         for spec in host_handlers:
             if isinstance(spec, (tuple, list)):
-                assert len(spec) in (2, 3)
-                pattern = spec[0]
-                handler = spec[1]
-
-                if len(spec) == 3:
-                    kwargs = spec[2]
-                else:
-                    kwargs = {}
-                spec = URLSpec(pattern, handler, kwargs)
+                assert len(spec) in (2, 3, 4)
+                spec = URLSpec(*spec)
             handlers.append(spec)
             if spec.name:
                 if spec.name in self.named_handlers: