Commit graph

3021 commits

Author SHA1 Message Date
Eugene M. Kim
fee894e9e8 Re-revert to not using pytz
Will spin a tzinfo subclass.
2017-06-14 14:14:18 -07:00
Eugene M. Kim
e8113c4b77 Skip aware datetime tests if pytz is unavailable 2017-06-14 14:08:42 -07:00
Eugene M. Kim
ed5ff89800 Use pytz again for tests
This is because datetime.timezone is Python 3 only.  The only
alternative would be to hand-spin a datetime.tzinfo subclass, an
overkill.

This reverts commit 0e6cab3576.
2017-06-14 13:57:40 -07:00
Eugene M. Kim
8df850cc9d Merge branch 'master' of github.com:pallets/flask into json_encode_non_utc_datetimes 2017-06-14 13:11:53 -07:00
Eugene M. Kim
45bfd49231 Rewrite test_jsonify_aware_datetimes without pytz 2017-06-14 13:06:26 -07:00
David Lord
a026b66ddb Merge pull request #2373 from davidism/reload_templates_run_debug
Reconfigure app when debug is set by run command
2017-06-14 12:56:42 -07:00
Eugene M. Kim
f251f91b35 Correctly encode aware, non-UTC datetime objects
http_date() requires timetuple in UTC, but JSONEncoder.default() was
passing a local timetuple instead.
2017-06-14 12:40:53 -07:00
David Lord
96e7553f10 test no debug flag doesn't reconfigure
test templates_auto_reload property instead of config
use app fixture in test
2017-06-14 12:31:56 -07:00
Eugene M. Kim
8b3fb19a0a Add UTs for #2372
test_encode_aware_datetime() fails for non-UTC timezones due to the bug.
2017-06-14 12:22:09 -07:00
David Lord
c34c5d9e43 reconfigure the app from run command and method
extract templates_auto_reload to property
continues #1910
closes #1907
2017-06-14 12:08:25 -07:00
David Lord
0e1f7d5859 Merge branch 'master' into reload_templates_run_debug 2017-06-14 09:58:33 -07:00
David Lord
c20f4f3542 Merge pull request #2371 from davidism/register_blueprint-doc
document `Flask.register_blueprint` arguments
2017-06-14 07:41:44 -07:00
David Lord
cb85cbece0 document the blueprint param too 2017-06-14 07:26:48 -07:00
David Lord
b83bc9b6a4 document Flask.register_blueprint arguments
closes #1809
2017-06-14 07:16:55 -07:00
David Lord
aa823345b9 Merge pull request #2370 from tony/patch-2
Add docutils label for class-based views
2017-06-13 06:28:18 -07:00
David Lord
e6240e0218 Merge pull request #2369 from tony/patch-1
Add docutils label for templates page
2017-06-13 06:27:46 -07:00
Tony Narlock
226e010998 Add docutils label for class-based views 2017-06-12 16:15:52 -05:00
Tony Narlock
be1b754bdd Add docutils label for templates page 2017-06-12 16:07:24 -05:00
grahamlutz
5b7ceddf67 Remove duplicate word from docstring 2017-06-10 14:53:40 +02:00
David Lord
60523604ca Merge pull request #2366 from tristanfisher/master
Add basic how-to on using envvars for config
2017-06-09 10:30:31 -07:00
David Lord
56e53f99d1 formatting
[ci skip]
2017-06-09 10:28:54 -07:00
tristan fisher
8c8e523ca4 Fixes grammar and phrasing on envvar how-to 2017-06-09 10:54:47 -04:00
tristan fisher
6ef081c332 Add basic how-to on using envvars for config 2017-06-09 10:19:08 -04:00
David Lord
b6c1c74e63 Merge pull request #2364 from davidism/xss-note
mention csp for javascript: uri xss
2017-06-06 09:22:49 -07:00
David Lord
2517eefc66 mention csp for javascript: uri xss
closes #2174
[ci skip]
2017-06-06 09:21:44 -07:00
David Lord
4cb2243d2a Merge pull request #2363 from davidism/inherited-members
document inherited attributes for Flask and Blueprint
2017-06-06 07:52:55 -07:00
David Lord
d23f313a8b document inherited attributes for Flask and Blueprint
closes #480
[ci skip]
2017-06-06 07:51:52 -07:00
David Lord
300e32a109 Merge pull request #2362 from davidism/remove-error-handler-cache
Remove error handler cache
2017-06-05 06:34:49 -07:00
David Lord
388bbccded don't cache error handlers for exception mro
closes #2267, closes #1433
2017-06-05 06:24:08 -07:00
David Lord
08c8401539 failing test 2017-06-05 06:14:13 -07:00
David Lord
c7aa84daf8 Merge pull request #2361 from greyli/patch-3
Include flask.json package in setup()
2017-06-05 05:03:50 -07:00
Grey Li
f7eec31808 Include flask.json package in setup() 2017-06-05 16:11:16 +08:00
David Lord
39f1246f73 Merge pull request #2359 from davidism/cli-warning
Be smarter about adding ".cli" to reloader command
2017-06-04 12:38:34 -07:00
David Lord
e9343ee877 remove unused import 2017-06-04 12:38:10 -07:00
David Lord
e75bb4770e be smarter about adding ".cli" to reloader command
python -m flask.cli raises an import warning on > 2.6
it's only needed on 2.6, "flask" works otherwise
closes #2357
2017-06-04 12:26:21 -07:00
David Lord
2375dcb338 Merge pull request #2358 from davidism/json-mixin
JSON support for test client and Response
2017-06-04 12:02:40 -07:00
David Lord
ca0dbc87a9 clean up JSON code and docs 2017-06-04 11:44:00 -07:00
David Lord
1ed4062f8f Merge remote-tracking branch 'remotes/origin/master' into json-mixin 2017-06-04 09:42:39 -07:00
David Lord
6bb15576d5 Merge pull request #2354 from davidism/stream-session
Only open session if request does not have open session
2017-06-03 12:26:15 -07:00
David Lord
1895b7b1cc only open session if request hasn't been pushed yet
closes #1348
2017-06-02 11:12:18 -07:00
David Lord
f542c5f599 failing test for streaming session 2017-06-02 11:07:53 -07:00
David Lord
a300c6aef4 Merge pull request #2353 from grantwwu/patch-1
Clarify documentation for json parsing
2017-06-02 10:23:51 -07:00
David Lord
e8aed4faf8 mention mimetype and is_json 2017-06-02 10:17:40 -07:00
David Lord
fdd82d16bb Merge pull request #2352 from davidism/json-object-hook
Make session serializer extensible
2017-06-02 10:07:57 -07:00
David Lord
9c93ba2fa2 add tests for flask.json.tag 2017-06-02 10:01:30 -07:00
Grant Wu
9facbe8770 Clarify documentation for json parsing
Documentation does not currently mention that is_json accepts mimetypes that are not strictly application/json.
2017-06-02 12:00:54 -04:00
David Lord
9386115d1f finish documentation
[ci skip]
2017-06-02 08:09:37 -07:00
David Lord
389c2c9708 docs style cleanup
[ci skip]
2017-06-02 07:03:22 -07:00
David Lord
bce296bbcc pass serializer at tag init instead of to each method
split tagged dict and passthrough into separate cases
add docstrings
2017-06-02 06:36:13 -07:00
David Lord
45af152108 make session serializer extensible
support serializing 1-item dicts with tag as key
refactor serializer into flask.json.tag module
continues #1452, closes #1438, closes #1908
2017-06-01 22:47:23 -07:00