Merge branch 'master' of github.com:mitsuhiko/flask

2013-07-30 16:45:23 +02:00 · 2013-07-30 16:45:23 +02:00 · 559ae196e7
commit 559ae196e7
parent d1d835c023 da49f7398d
2 changed files with 6 additions and 5 deletions
--- a/flask/app.py
+++ b/flask/app.py
@ -969,11 +969,6 @@ class Flask(_PackageBoundObject):
        # Add the required methods now.
        methods |= required_methods

-        # due to a werkzeug bug we need to make sure that the defaults are
-        # None if they are an empty dictionary.  This should not be necessary
-        # with Werkzeug 0.7
-        options['defaults'] = options.get('defaults') or None
-
        rule = self.url_rule_class(rule, methods=methods, **options)
        rule.provide_automatic_options = provide_automatic_options