maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

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

Browse source
This commit is contained in:
Armin Ronacher 2013-07-30 16:45:23 +02:00
commit 559ae196e7
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/tutorial/setup.rst
View file

@ -25,6 +25,12 @@ In `flaskr.py`::
USERNAME = 'admin' USERNAME = 'admin'
PASSWORD = 'default' 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 Next we can create our actual application and initialize it with the
config from the same file, in `flaskr.py`:: config from the same file, in `flaskr.py`::

5
flask/app.py
View file

@ -969,11 +969,6 @@ class Flask(_PackageBoundObject):
# Add the required methods now. # Add the required methods now.
methods |= required_methods 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 = self.url_rule_class(rule, methods=methods, **options)
rule.provide_automatic_options = provide_automatic_options rule.provide_automatic_options = provide_automatic_options