Skip to content

Commit 2ea5262

Browse files
committed
update router method signature
1 parent c5c5880 commit 2ea5262

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

ioc/extra/tornado/handler.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,14 @@ def dispatch(self):
5252
self.event_dispatcher.dispatch('handler.not_found', {
5353
'handler': self,
5454
})
55-
except Exception:
55+
except Exception, e:
5656
self.set_status(500)
5757
self.write("An unexpected error occurred")
5858

59+
import traceback
60+
traceback.print_exc()
61+
62+
5963
self.event_dispatcher.dispatch('handler.exception', {
6064
'handler': self,
6165
})

ioc/extra/tornado/router.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,5 @@ def match(self, path_info=None, method=None, return_rule=False, query_args=None)
3030

3131
return name, parameters, self._view_functions[name]
3232

33-
def generate(self, name, values=None, method=None, force_external=False, append_unknown=True):
34-
35-
return self.adapter().build(name, values, method, force_external, append_unknown)
33+
def generate(self, name, method=None, force_external=False, append_unknown=True, **kwargs):
34+
return self.adapter().build(name, kwargs, method, force_external, append_unknown)

tests/ioc/extra/tornado/test_router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ def test_add_and_generate_routes(self):
2525
self.router.add("blog_post", "/blog/<string:slug>", view)
2626

2727
self.assertEquals("/", self.router.generate("homepage"))
28-
self.assertEquals("/blog/hello", self.router.generate("blog_post", {'slug': 'hello'}))
28+
self.assertEquals("/blog/hello", self.router.generate("blog_post", slug="hello"))
2929

30-
self.assertEquals("http://localhost/blog/hello", self.router.generate("blog_post", {'slug': 'hello'}, force_external=True))
30+
self.assertEquals("http://localhost/blog/hello", self.router.generate("blog_post", slug="hello", force_external=True))

0 commit comments

Comments
 (0)