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

docs/tutorial/setup.rst

@@ -25,6 +25,12 @@ In `flaskr.py`::
     USERNAME = 'admin'
     PASSWORD = 'default'
 
+.. admonition:: Windows
+
+    If you are on Windows, replace `/tmp/flaskr.db` with a different writeable
+    path of your choice, in the configuration and for the rest of this
+    tutorial.
+
 Next we can create our actual application and initialize it with the
 config from the same file, in `flaskr.py`::
 

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