Eugene M. Kim
eb9618347c
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
5b38fe2fbe
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
0e6cab3576
Rewrite test_jsonify_aware_datetimes without pytz
2017-06-14 13:06:26 -07:00
David Lord
1e112cccaa
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
d41e2e6a5d
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
4d2a3ab2e0
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
d75d83defd
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
4fc48200a5
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
9e39c506e0
Merge branch 'master' into reload_templates_run_debug
2017-06-14 09:58:33 -07:00
David Lord
2c97ed985e
Merge pull request #2371 from davidism/register_blueprint-doc
...
document `Flask.register_blueprint` arguments
2017-06-14 07:41:44 -07:00
David Lord
fe1bf3c821
document the blueprint param too
2017-06-14 07:26:48 -07:00
David Lord
0f7b3a4f26
document Flask.register_blueprint arguments
...
closes #1809
2017-06-14 07:16:55 -07:00
David Lord
e97f6e22e6
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
75c4ea24c2
Merge pull request #2369 from tony/patch-1
...
Add docutils label for templates page
2017-06-13 06:27:46 -07:00
Tony Narlock
91fd33dbd9
Add docutils label for class-based views
2017-06-12 16:15:52 -05:00
Tony Narlock
66e9dc9df2
Add docutils label for templates page
2017-06-12 16:07:24 -05:00
grahamlutz
cf425403c8
Remove duplicate word from docstring
2017-06-10 14:53:40 +02:00
David Lord
094b116c7f
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
01d2f725d3
formatting
...
[ci skip]
2017-06-09 10:28:54 -07:00
tristan fisher
53ff054fd3
Fixes grammar and phrasing on envvar how-to
2017-06-09 10:54:47 -04:00
tristan fisher
067686b471
Add basic how-to on using envvars for config
2017-06-09 10:19:08 -04:00
David Lord
9d82993422
Merge pull request #2364 from davidism/xss-note
...
mention csp for javascript: uri xss
2017-06-06 09:22:49 -07:00
David Lord
15756da1f0
mention csp for javascript: uri xss
...
closes #2174
[ci skip]
2017-06-06 09:21:44 -07:00
David Lord
45946028e7
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
235c830759
document inherited attributes for Flask and Blueprint
...
closes #480
[ci skip]
2017-06-06 07:51:52 -07:00
David Lord
b80cf057fc
Merge pull request #2362 from davidism/remove-error-handler-cache
...
Remove error handler cache
2017-06-05 06:34:49 -07:00
David Lord
b5f4c52150
don't cache error handlers for exception mro
...
closes #2267 , closes #1433
2017-06-05 06:24:08 -07:00
David Lord
5c12acefbb
failing test
2017-06-05 06:14:13 -07:00
David Lord
706e67ed9e
Merge pull request #2361 from greyli/patch-3
...
Include flask.json package in setup()
2017-06-05 05:03:50 -07:00
Grey Li
16396248b8
Include flask.json package in setup()
2017-06-05 16:11:16 +08:00
David Lord
f29fa0d56b
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
12c45f06a5
remove unused import
2017-06-04 12:38:10 -07:00
David Lord
fa7e8d6073
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
63129e8426
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
e97253e4c1
clean up JSON code and docs
2017-06-04 11:44:00 -07:00
David Lord
dbc70c9274
Merge remote-tracking branch 'remotes/origin/master' into json-mixin
2017-06-04 09:42:39 -07:00
David Lord
3b678b7927
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
6637e20174
only open session if request hasn't been pushed yet
...
closes #1348
2017-06-02 11:12:18 -07:00
David Lord
5978a0f55f
failing test for streaming session
2017-06-02 11:07:53 -07:00
David Lord
49f3e96844
Merge pull request #2353 from grantwwu/patch-1
...
Clarify documentation for json parsing
2017-06-02 10:23:51 -07:00
David Lord
217d5f9bc0
mention mimetype and is_json
2017-06-02 10:17:40 -07:00
David Lord
62406e667c
Merge pull request #2352 from davidism/json-object-hook
...
Make session serializer extensible
2017-06-02 10:07:57 -07:00
David Lord
fd8b95952c
add tests for flask.json.tag
2017-06-02 10:01:30 -07:00
Grant Wu
daf85d3725
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
9bee2500dd
finish documentation
...
[ci skip]
2017-06-02 08:09:37 -07:00
David Lord
bbd15d53ad
docs style cleanup
...
[ci skip]
2017-06-02 07:03:22 -07:00
David Lord
ca176cb903
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
5e1ced3c05
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
David Lord
ea2e9609bc
Merge branch 'master' into json-object-hook
2017-06-01 06:40:27 -07:00
David Lord
c7f433c49b
Merge pull request #2350 from davidism/errorhandler
...
show nice message when registering error handler for unknown code
2017-05-31 21:04:21 -07:00
