Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mitsuhiko/flask
...
head fork: mitsuhiko/flask
Checking mergeability… Don't worry, you can still create the pull request.
  • 20 commits
  • 8 files changed
  • 0 commit comments
  • 10 contributors
Commits on Jul 01, 2012
@lvh lvh CHANGES: July 1th should be July 1st 56f5224
@mitsuhiko Merge pull request #536 from lvh/patch-1
CHANGES: July 1th should be July 1st
e32de73
@esaurito esaurito Fixed codename d8e5a37
@kennethreitz kennethreitz Merge pull request #537 from esaurito/patch-1
Fixed codename
0787872
Commits on Jul 04, 2012
@svenstaro svenstaro Made it explicitly clear where changes should go in the tutorial 0553bbd
@rduplain rduplain Merge pull request #539 from svenstaro/master
Changed tutorial to be more explicit
7003fe6
@svenstaro svenstaro Fix chose -> choose typo 690b0c3
@rduplain rduplain Merge pull request #540 from svenstaro/master
Fix typo in tutorial
c7cdb2f
@rduplain rduplain Touch up dbinit tutorial doc.
Discussion on #pocoo with svenstaro, dAnjou, noob13.
ea2a062
Commits on Jul 20, 2012
Randall Degges Fixing some wording in the design documentation. 40ccc0a
@kennethreitz kennethreitz Merge pull request #559 from rdegges/master
Fixing some wording in the design documentation.
9d9f240
Commits on Jul 21, 2012
@yaph yaph Try to correct confusing sentence in doc and fixed word duplication. 3800c73
@kennethreitz kennethreitz Merge pull request #562 from yaph/master
Small improvement to docs
0f3bc38
Commits on Jul 26, 2012
@PaulMcMillan PaulMcMillan docstring typo 20a542f
@kennethreitz kennethreitz Merge pull request #567 from PaulMcMillan/docs_fix
docstring typo
50dc240
Commits on Aug 01, 2012
@plaes plaes Docs: Mention SERVER_NAME in the url_for() docstring ed1619a
@plaes plaes Docs: Fix docstring formatting e3b3e05
@kennethreitz kennethreitz Merge pull request #571 from plaes/doc-improvements
Doc improvements for url_for()
9a0f651
Commits on Aug 11, 2012
@mitsuhiko Merge branch 'master' of github.com:mitsuhiko/flask 43f4120
@mitsuhiko Merge branch 'master' into json-sessions 704d94d
View
4 CHANGES
@@ -15,7 +15,7 @@ Release date to be decided.
Version 0.9
-----------
-Released on July 1st 2012, codename Camapri.
+Released on July 1st 2012, codename Campari.
- The :func:`flask.Request.on_json_loading_failed` now returns a JSON formatted
response by default.
@@ -86,7 +86,7 @@ Released on July 1st 2012, codename Camapri.
Version 0.8.1
-------------
-Bugfix release, released on July 1th 2012
+Bugfix release, released on July 1st 2012
- Fixed an issue with the undocumented `flask.session` module to not
work properly on Python 2.5. It should not be used but did cause
View
3  docs/appcontext.rst
@@ -44,8 +44,7 @@ you can have more than one application in the same Python process.
So how does the code find the “right” application? In the past we
recommended passing applications around explicitly, but that caused issues
-with libraries that were not designed with that in mind for libraries for
-which it was too inconvenient to make this work.
+with libraries that were not designed with that in mind.
A common workaround for that problem was to use the
:data:`~flask.current_app` proxy later on, which was bound to the current
View
6 docs/design.rst
@@ -90,9 +90,9 @@ since decorators could be fired in undefined order when the application is
split into multiple modules.
Another design decision with the Werkzeug routing system is that routes
-in Werkzeug try to ensure that there is that URLs are unique. Werkzeug
-will go quite far with that in that it will automatically redirect to a
-canonical URL if a route is ambiguous.
+in Werkzeug try to ensure that URLs are unique. Werkzeug will go quite far
+with that in that it will automatically redirect to a canonical URL if a route
+is ambiguous.
One Template Engine
View
2  docs/quickstart.rst
@@ -377,7 +377,7 @@ package it's actually inside your package:
/hello.html
For templates you can use the full power of Jinja2 templates. Head over
-to the the official `Jinja2 Template Documentation
+to the official `Jinja2 Template Documentation
<http://jinja.pocoo.org/2/documentation/templates>`_ for more information.
Here is an example template:
View
6 docs/tutorial/dbinit.rst
@@ -23,14 +23,16 @@ for you to the application.
If you want to do that, you first have to import the
:func:`contextlib.closing` function from the contextlib package. If you
want to use Python 2.5 it's also necessary to enable the `with` statement
-first (`__future__` imports must be the very first import)::
+first (`__future__` imports must be the very first import). Accordingly,
+add the following lines to your existing imports in `flaskr.py`::
from __future__ import with_statement
from contextlib import closing
Next we can create a function called `init_db` that initializes the
database. For this we can use the `connect_db` function we defined
-earlier. Just add that function below the `connect_db` function::
+earlier. Just add that function below the `connect_db` function in
+`flask.py`::
def init_db():
with closing(connect_db()) as db:
View
2  docs/tutorial/introduction.rst
@@ -3,7 +3,7 @@
Introducing Flaskr
==================
-We will call our blogging application flaskr here, feel free to chose a
+We will call our blogging application flaskr here, feel free to choose a
less web-2.0-ish name ;) Basically we want it to do the following things:
1. let the user sign in and out with credentials specified in the
View
2  flask/app.py
@@ -1468,7 +1468,7 @@ def create_url_adapter(self, request):
.. versionchanged:: 0.9
This can now also be called without a request object when the
- UR adapter is created for the application context.
+ URL adapter is created for the application context.
"""
if request is not None:
return self.url_map.bind_to_environ(request.environ,
View
4 flask/helpers.py
@@ -305,7 +305,9 @@ def external_url_handler(error, endpoint, **values):
:param endpoint: the endpoint of the URL (name of the function)
:param values: the variable arguments of the URL rule
- :param _external: if set to `True`, an absolute URL is generated.
+ :param _external: if set to `True`, an absolute URL is generated. Server
+ address can be changed via `SERVER_NAME` configuration variable which
+ defaults to `localhost`.
:param _anchor: if provided this is added as anchor to the URL.
:param _method: if provided this explicitly specifies an HTTP method.
"""

No commit comments for this range

Something went wrong with that request. Please try again.