Commit graph

602 commits

Author SHA1 Message Date
Kenneth Reitz
4c0253f9fd Merge pull request #862 from bikerm16/master
Minor test fixes
2014-03-21 16:39:13 -04:00
max demian
db12a8f5e4 Update wrappers.py 2014-03-15 14:45:37 +01:00
max demian
6974d52815 Update views.py 2014-03-15 14:44:27 +01:00
max demian
2eef63a320 Update signals.py 2014-03-15 14:42:21 +01:00
max demian
f3f7b640b9 Update sessions.py
missing backticks in docstring
2014-03-15 14:38:19 +01:00
max demian
cb25c42316 Update json.py 2014-03-15 14:35:21 +01:00
Daniel Neuhäuser
a71b65cb15 Merge pull request #877 from yoloseem/patch-1
Fix a typo on blueprints module name.
2014-03-13 20:35:29 +01:00
Daniel Neuhäuser
06857c9ba5 Add Config.get_namespace to CHANGES 2014-03-13 20:23:43 +01:00
Daniel Neuhäuser
ba80e1e33b Fix Python 3 compat issue in Config.get_namespace 2014-03-13 20:22:18 +01:00
Daniel Neuhäuser
0674ee875d Merge branch 'config-namespaces' of https://github.com/mattupstate/flask into config-namespaces
Conflicts:
	flask/config.py
2014-03-13 20:20:22 +01:00
Charles-Axel Dein
dfae2679a6 Clarify the after_request argument
Make it a bit clearer that it's an instance of response_class that is
expected, not the actual response_class class.
2014-03-05 15:22:59 -08:00
Daniel Neuhäuser
d43bfb261a Add assertIsInstance to FlaskTestCase on 2.6
This fixes an error in ConfigTestCase.test_custom_config_class
2014-02-20 19:17:59 +01:00
Daniel Neuhäuser
3f8e29b12c Add Flask.config_class to changelog 2014-02-20 19:15:42 +01:00
Daniel Neuhäuser
66e51d5be7 Merge branch 'master' of https://github.com/Xion/flask into Xion-master
Conflicts:
	flask/testsuite/config.py
2014-02-20 19:12:56 +01:00
Daniel Neuhäuser
97411295e3 Add Config.from_json to changelog 2014-02-12 23:53:51 +01:00
Daniel Neuhäuser
95a1ce4d6e Merge branch 'config-from-json' of https://github.com/mattupstate/flask into mattupstate-config-from-json 2014-02-12 23:42:39 +01:00
Armin Ronacher
98754b0e4f Merge branch '0.10-maintenance' 2014-02-09 16:08:03 +00:00
Armin Ronacher
ddb5f9dc49 Fixed a broken test 2014-02-09 16:07:56 +00:00
Armin Ronacher
5b0545bf80 Merge branch '0.10-maintenance' 2014-02-09 13:29:03 +00:00
Armin Ronacher
fb622380d0 Use older descriptor to support older werkzeug versions 2014-02-09 13:28:57 +00:00
Armin Ronacher
a9503580d2 Merge branch '0.10-maintenance' 2014-02-09 13:27:05 +00:00
Armin Ronacher
75f2af7a6a Use a condition variable instead of sleeping 2014-02-09 13:25:36 +00:00
Alexis Svinartchouk
280d865960 fix issue #879 and add a test for it
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
2014-02-09 13:22:05 +00:00
Armin Ronacher
9298d89aed Merge branch '0.10-maintenance' 2014-02-09 13:14:26 +00:00
Armin Ronacher
964c4a37c0 Closed an unclosed file in the tests 2014-02-09 13:14:15 +00:00
Armin Ronacher
001100bc0b Fixed PyStringIO in tests for 2.x 2014-02-09 13:13:31 +00:00
Armin Ronacher
8cb79fd026 Added a test for sending from directories 2014-02-09 13:06:54 +00:00
Armin Ronacher
76e2f9cd03 Fixed send_from_directory not rebasing to the root path. This fixes #921 2014-02-09 13:01:54 +00:00
Armin Ronacher
23d9b33e92 Merge branch '0.10-maintenance' 2014-02-08 22:30:00 +00:00
Armin Ronacher
d094d5b6fc Fixed warning and broken tests on 3.3 2014-02-08 22:29:46 +00:00
Armin Ronacher
e2264d0607 Merge pull request #936 from zheller/fix-typo
Fix typo in helpers.py
2014-02-08 17:46:32 +00:00
Armin Ronacher
2506c0b9a9 Fixed sending etags for file streams with a name. This fixes #930. 2014-02-08 17:45:27 +00:00
Armin Ronacher
a8f6f7413f Merge branch '0.10-maintenance' 2014-02-08 17:39:46 +00:00
Armin Ronacher
46c24da016 Make before_first_request a decorator 2014-02-08 17:39:26 +00:00
Armin Ronacher
ae45aed8d6 Removed an unnecessary newline 2014-02-08 17:36:12 +00:00
Armin Ronacher
f07e4cb0c3 Merge branch '0.10-maintenance' 2014-02-08 17:32:59 +00:00
Armin Ronacher
6de9484c97 Fixed a typo 2014-02-08 17:32:54 +00:00
Armin Ronacher
c9bf907037 Merge pull request #938 from ahlen/response-with-headers-without-status
Enable tuple responses with headers without status
2014-02-08 17:32:01 +00:00
Armin Ronacher
53528ad2c3 Merge branch '0.10-maintenance' 2014-02-08 17:19:11 +00:00
Armin Ronacher
e7c587789a Fixe a bug in the test client causing url parameters to be removed. This fixes #968 2014-02-08 17:19:00 +00:00
Armin Ronacher
e5bba9deb5 Added support for custom JSON mimetypes 2014-02-08 17:01:13 +00:00
Kenneth Reitz
17a3056be4 Merge pull request #961 from GCorbel/patch-1
Remove the extra "1"
2014-01-27 09:39:04 -08:00
Armin Ronacher
e78961c812 Fixed a missing import 2014-01-26 18:08:02 +00:00
Armin Ronacher
52e1c383fa Make Python 3 happy 2014-01-26 17:47:16 +00:00
Armin Ronacher
6ec83e18dc Added a workaround for a pypy bug in context managers 2014-01-26 17:34:37 +00:00
Guriec Corbel
21aa620b6b Remove the extra "1" 2014-01-24 12:43:23 -05:00
Matt Wright
90a50f8b51 Add get_namespace method on Config object for convenient access of namespaced config options. 2014-01-23 15:05:37 -05:00
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