Commit graph

2323 commits

Author SHA1 Message Date
Daniel Neuhäuser
d517f35d60 Merge branch '0.10-maintenance' 2014-01-02 19:21:55 +01:00
Daniel Neuhäuser
52098e1e4f Happy New Year 2014 2014-01-02 19:21:07 +01:00
Mikael Åhlén
dbc4096191 added a new test case with a Response instance and cleaned up the code 2013-12-31 22:59:00 +01:00
Mikael Åhlén
70f8b39c52 added a new behaviour for responses that enable the tuple to be in the form of (response, headers) and continiue to support the (response, status, headers) format. 2013-12-31 22:16:13 +01:00
Zachary Wright Heller
5addabfbdd Fix typo in helpers.py 2013-12-24 20:12:34 -08:00
Mark Hildreth
6a37c1716d Fixed incorrect grammar in Config.rst
Fixed incorrect grammar in "SESSION_REFRESH_EACH_REQUEST" configuration description.
2013-12-24 14:36:28 -05:00
Afik
67c165bcbb Update celery.rst
With the latest version of Celery (3.1.6), following this tutorial produces the following error when attempting to start the celery worker: 

    user_preload = tuple(self.app.user_options['preload'] or ())
AttributeError: 'Flask' object has no attribute 'user_options'

Using `app` as the variable name here confuses celery. Renaming `app` to `flask_app` in the tutorial solves the issue and allows the celery worker to start successfully.
2013-12-16 22:04:51 -08:00
Armin Ronacher
afd3c4532b Rewrapped lines 2013-11-09 13:41:09 +00:00
Reetta Vaahtoranta
0d648fa468 Changed the wording of some sentences there were difficult to understand. 2013-11-09 13:13:14 +00:00
Daniel Neuhäuser
d4f8634289 Merge pull request #899 from pengfei-xue/master
fix typo(there-> their)
2013-11-01 02:18:14 -07:00
Pengfei Xue
ecb31c6804 fix typo 2013-10-30 16:45:44 +08:00
d3spis3d
05dbf52fa5 URL Reversing in Quickstart #779
Updated quickstart to make clear that URL reversing refers to the use of
url_for() to build the URL. Issue #779
2013-10-30 11:29:18 +11:00
Daniel Neuhäuser
d14f57d9b8 Merge pull request #895 from daybarr/patch-1
Fix typo in docs for error_handler_spec
2013-10-29 02:35:48 -07:00
Day Barr
c021e58775 Fix typo in docs for error_handler_spec 2013-10-25 16:51:29 +01:00
Christopher Su
9cecf0d81c moved Table import to next code block 2013-10-22 11:37:35 -07:00
Daniel Neuhäuser
5689ef3639 Fix typo s/at at/at a/ 2013-10-22 14:01:33 +02:00
Daniel Neuhäuser
b63a9926dd Merge branch '0.10-maintenance' 2013-10-16 20:13:19 +02:00
Daniel Neuhäuser
a3a2f521f1 Clear exceptions when pushing a context
Fixes #882
2013-10-16 20:12:20 +02:00
Daniel Neuhäuser
544118bef9 Merge pull request #891 from ThiefMaster/docs-flaskext
Don't refer to flaskext in app.extensions docs
2013-10-16 10:09:41 -07:00
Daniel Neuhäuser
4212e67d29 Merge pull request #890 from seancron/documentation-fix
Documentation fix: Makes the error names consistent
2013-10-16 10:08:49 -07:00
Daniel Neuhäuser
cab514e9f1 Merge pull request #886 from talam/patch-1
Updated some typos
2013-10-16 10:06:01 -07:00
Adrian
46b5754d97 Don't refer to flaskext in docs 2013-10-15 21:47:42 +02:00
Sean Cronin
a7f5d60789 Makes the error names consistent 2013-10-15 12:37:25 -04:00
Matt Skone
1df0f2dc1c Escaped 'text' keyword in column name. 2013-10-15 09:17:19 -07:00
talam
b7f21831fa Updated some typos
Fixed some incorrect variable references.
2013-10-12 18:14:26 -04:00
John Hobbs
e31a2a80ec Update url_for documentation
Previous documentation referenced a non-existent property on the Flask
object called "build_error_handler".

This should actually reference Flask.url_build_error_handlers.
2013-10-11 17:03:54 -05:00
rsyring
fc85bf42ae Update appfactories.rst, make extension related section clearer 2013-10-11 08:39:46 -04:00
Alexey Shamrin
f161a71c19 quickstart: import request in HTTP methods example 2013-10-03 05:15:27 +04:00
Hyunjun Kim
5ecca4c0da Fix a typo on blueprints module name. 2013-10-02 15:10:27 +09:00
defuz
3e485009a8 add TEMPLATES_AUTO_RELOAD option to config 2013-09-30 21:06:49 +03:00
defuz
475b0c1cd9 fix typo (jsonfiy) 2013-09-26 18:46:30 +03:00
dmackinnon
231f45b432 Fix typo 2013-09-25 11:50:02 -04:00
Daniel Richman
3d67736e09 Check error handlers for specific classes first
This allows adding error handlers like this:

    @app.errorhandler(werkzeug.exceptions.Forbidden)

And subclassing HTTPExceptions:

    class ForbiddenBecauseReason(Forbidden): pass

    @app.errorhandler(ForbiddenBecauseReason)
    def error1(): return "Forbidden because reason", 403
    @app.errorhandler(403)
    def error2(): return "Forbidden", 403

... the idea being, that a flask extension might want to raise an
exception, with the default behaviour of creating a HTTP error page,
but still allowing the user to add a view/handler specific to that
exception (e.g., "Forbidden because you are not in the right group").
2013-09-21 21:16:24 +00:00
Christopher Su
8089eb5769 added missing import in sqlalchemy doc 2013-09-19 23:31:09 -07:00
Oliver Beattie
2a512ab907 Merge branch 'master' of github.com:obeattie/flask 2013-09-09 15:15:47 +01:00
Oliver Beattie
bb882454a0 Make the decorators attribute on View a tuple by default
To discourage accidental runtime modification applying to all views.
2013-09-09 15:13:42 +01:00
Daniel Neuhäuser
5d20501604 Merge pull request #863 from jet-sun/patch-1
Fix typo.
2013-09-08 11:27:27 -07:00
Jet Sun
6ebe45b0ad Fix typo. 2013-09-07 17:42:06 -07:00
Michael Bikovitsky
b7337080e4 Fix test_send_file_object
static/index.html now opens in binary mode, and therefore newline conversion does not take place.
2013-09-07 18:29:49 +03:00
Michael Bikovitsky
cff35237ef Fix test_no_error_swallowing
Path in assertion is now cross-platform.
2013-09-07 18:21:15 +03:00
Wouter Van Hemel
079ae20f24 Add tests for user-defined exceptions in blueprints 2013-09-06 11:17:30 +03:00
Daniel Neuhäuser
ff59db16bc Merge pull request #858 from svieira/patch-2
Patch for tutorial (minor code error)
2013-09-04 07:54:42 -07:00
Wouter Van Hemel
b03181363b Add a non-decorator version of the error handler register function
The main application object has a register_error_handler function
which mirrors the decorator's functionality. According to the principle
of least surprise, make sure blueprints also have this convenience function.
2013-09-04 12:42:35 +03:00
Sean Vieira
12d6ec4130 Fix with block 2013-09-03 23:36:10 -04:00
Daniel Neuhäuser
36d70d8789 Merge pull request #843 from wbowlin/master
corrected documentation for Request get_json()
2013-09-03 10:58:04 -07:00
Daniel Neuhäuser
5207c69064 Fix #856 ommited typo in quickstart 2013-09-03 19:47:00 +02:00
Armin Ronacher
8f1dada542 Some cleanups 2013-09-02 04:57:01 +06:00
Armin Ronacher
51d7c8de7d Merge branch 'master' of github.com:mitsuhiko/flask 2013-09-01 01:43:24 +06:00
Armin Ronacher
05161d3584 Rewrote tutorial to use the g based appcontext object 2013-09-01 01:32:41 +06:00
Armin Ronacher
42cf782ee3 Removed g object from example as it was unused 2013-08-30 19:50:45 +06:00