Commit graph

2296 commits

Author SHA1 Message Date
Alan Hamlett
e4f635f8d7 remove whitespace at end of lines 2015-07-04 23:41:31 +02:00
Markus Unterwaditzer
37474871dc Merge pull request #1509 from ThiefMaster/appctxglobals-candy
Add pop and setdefault to AppCtxGlobals
2015-06-30 21:33:04 +02:00
Markus Unterwaditzer
595fb7e1fa Merge pull request #1510 from ThiefMaster/remove-modules-property
Remove the deprecated Flask.modules property
2015-06-21 19:37:34 +02:00
ThiefMaster
6af9690ae9 Remove the deprecated Flask.modules property 2015-06-20 18:09:27 +02:00
ThiefMaster
bbaf20de7c Add pop and setdefault to AppCtxGlobals 2015-06-20 18:04:58 +02:00
Markus Unterwaditzer
87222087b3 Merge branch 'alexpantyukhin-master'
Fix #1390
2015-06-17 15:45:57 +02:00
Alexander Pantyukhin
a9066a3756 Changes and docs are modified. 2015-06-17 15:45:37 +02:00
Alexander Pantyukhin
5e12748d0e Ignore before_render_template return values 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
883f82f261 template overrides handling changed 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
eae37b575d fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
e57199e0c4 fix test_signals 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
967907ee81 before_render_template signal can override render template. 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
1fbeb337c4 fix endline in the signal.py 2015-06-17 15:42:39 +02:00
Alexander Pantyukhin
d53d5c732b before_render_template signal 2015-06-17 15:42:39 +02:00
Markus Unterwaditzer
cb9f645081 Merge pull request #1502 from untitaker/travis-simplify
Don't pass version to tox explicitly
2015-06-17 13:17:12 +02:00
Markus Unterwaditzer
284081c452 Don't pass version to tox explicitly 2015-06-17 13:03:59 +02:00
Markus Unterwaditzer
9ddd3e9084 Merge pull request #1499 from menghan/doc
Fix project name in CONTRIBUTING.rst
2015-06-13 17:55:12 +02:00
Menghan
30973310ec Replace 'Werkzeug' to 'Flask' 2015-06-13 23:16:14 +08:00
Markus Unterwaditzer
554c5b965a Fix #1477 2015-06-13 17:07:51 +02:00
Markus Unterwaditzer
cc6bf7c18a Merge pull request #1496 from Hardtack/patch-1
Update title of docstring in flask.cli
2015-06-13 13:50:50 +02:00
GunWoo Choi
c65b32ba1d Update title of docstring in flask.cli 2015-06-12 13:40:53 +09:00
Markus Unterwaditzer
bc4c1777e9 Document static_folder 2015-06-11 19:55:51 +02:00
Markus Unterwaditzer
beec47a7cc Deduplicate signals docs
Triggered by #1390
2015-06-10 18:42:55 +02:00
Markus Unterwaditzer
3e07b9c287 Merge pull request #1491 from nvie/patch-1
Remove the word `trivially` here
2015-06-10 11:45:37 +02:00
Vincent Driessen
a4b335a64a Remove the word trivially here
A lot of things are trivial, or debatably trivial, but this is not one of them :)
2015-06-10 10:58:49 +02:00
Markus Unterwaditzer
b471df6c88 Point to stable version of Celery 2015-06-08 15:18:34 +02:00
Keyan Pishdadian
805692108a Update send_file() docs to clarify encoding requirement #1286 2015-06-06 07:38:09 +02:00
Markus Unterwaditzer
d13a1b363e Rename jinja_env_class
Inspired by #1056
2015-06-06 06:29:26 +02:00
Markus Unterwaditzer
66b4ea91b4 Fix #1195 2015-06-06 06:25:41 +02:00
Markus Unterwaditzer
5c68b24f64 Merge pull request #1483 from untitaker/improve-autodoc
Show original autodoc signatures
2015-06-06 04:17:57 +02:00
Markus Unterwaditzer
d40288496c Show original autodoc signatures
Alternative to #1403
2015-06-06 04:17:33 +02:00
Markus Unterwaditzer
7a999cd4b8 Merge branch 'AndrewBMartin-patch-1' 2015-06-06 03:35:22 +02:00
Andrew
337a9d6172 Include backend argument when instantiating Celery
Not including the backend argument can lead to AttributeError:
DisabledBackend object has no attribute for '_get_task_meta_for'.

See e.g.
http://stackoverflow.com/questions/23215311/celery-with-rabbitmq-attributeerror-disabledbackend-object-has-no-attribute.

At the same time, including the backend argument doesn't seem to harm anything else.
2015-06-06 03:35:04 +02:00
Markus Unterwaditzer
1e857bfa71 Changelog for #1422 2015-06-06 03:31:51 +02:00
Markus Unterwaditzer
d00f5cc9fe Merge branch 'ThiefMaster-override-jinja-env' 2015-06-06 03:30:49 +02:00
Markus Unterwaditzer
2446ca63a8 0.11 => 1.0 2015-06-06 03:29:44 +02:00
Markus Unterwaditzer
5ebf1e824d Merge pull request #1480 from jmcarp/handle-empty-deque
Handle empty deque on errorhandler lookup.
2015-06-03 17:46:10 +02:00
Joshua Carp
348bf52188 Handle empty deque on errorhandler lookup.
After registering a custom errorhandler by exception class, raising any
unhandled exception in a view function swallows the error and instead
throws an `IndexError` on trying to look up the appropriate handler.
This patch avoids the uninformative `IndexError` and preserves the
original exception by looping until the deque of classes is empty, not
forever.
2015-06-02 16:13:30 -04:00
Markus Unterwaditzer
0d19fa0a06 Clarify some docs
Fix #1476
2015-05-31 18:59:14 +02:00
Markus Unterwaditzer
6e77cd709e Merge pull request #1463 from moonshadow/fix_docstring
fix docstring for _find_errorhandler
2015-05-20 14:52:08 +02:00
Wang Haowei
be45a608e3 fix docstring for _find_errorhandler 2015-05-20 20:31:06 +08:00
Markus Unterwaditzer
1e15e17a66 Merge pull request #1461 from justinwp/patch-1
fixed import of werkzeug secure_filename
2015-05-15 10:24:24 +02:00
Justin Poehnelt
17d7353d39 fixed import of werkzeug secure_filename 2015-05-14 23:44:49 -07:00
Markus Unterwaditzer
3fe68c221a Merge pull request #1455 from nickjj/docs_contributing
Add pip install --editable . to contributing docs
2015-05-07 13:24:13 +02:00
Nick Janetakis
8a96091644 Add pip install --editable . to contributing docs 2015-05-06 16:07:47 -07:00
Markus Unterwaditzer
f0926d7b18 Merge pull request #1453 from ozbek/master
Replace 'I' with 'We'
2015-05-06 15:55:28 +02:00
Shuhrat Dehkanov
a1c55a698c Replace 'I' with 'We'
To be consistent with the usage elsewhere in the README
2015-05-06 22:13:52 +09:00
Markus Unterwaditzer
61f12d6a8d Merge pull request #1450 from Carreau/importlib
importlib deprecated in 3.4
2015-05-02 21:58:44 +02:00
Matthias Bussonnier
2de525c720 importlib deprecated in 3.5.
Replace the use of importlib by types.ModuleType that seem to be
available since at least 2.6

closes gh-1449
2015-05-02 10:54:38 -07:00
Markus Unterwaditzer
73c833568d Merge pull request #1448 from fordhurley/custom_converters
Mention that custom converters can be defined for url routes
2015-05-01 20:11:33 +02:00