Commit graph

27 commits

Author SHA1 Message Date
Markus Unterwaditzer
3550b26071 Move tests 2014-09-11 22:09:50 +02:00
Daniel Neuhäuser
aa40b1731e Add Config.from_mapping 2014-07-27 13:09:14 +02: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
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
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
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
52098e1e4f Happy New Year 2014 2014-01-02 19:21:07 +01:00
Daniel Neuhäuser
94f4360137 Explain is_package AttributeError in find_package
When a PEP 302 import hook is used that doesn't implement .is_package()
an AttributeError is raised. This looks like a bug in Flask. This change
fixes that problem in the sense that it explains, that the
AttributeError is intentional.
2013-08-13 15:53:58 +02:00
Matt Wright
b290bf4079 Add ability to config from a JSON file 2013-08-07 18:03:37 -04:00
Karol Kuczmarski
ec5b182f15 Add Flask.config_class feature 2013-06-22 22:09:30 +02:00
Daniel Neuhäuser
62e7275bdf Use assert_false where appropriate 2013-05-22 20:17:29 +02:00
Daniel Neuhäuser
9f8a2075c7 Use assert_in where appropriate 2013-05-22 20:12:50 +02:00
Daniel Neuhäuser
239780be28 Use assert_true instead of assert_
assert_ is deprecated which causes annoying warnings
2013-05-22 17:23:38 +02:00
Thomas Waldmann
e1d356fb71 ported some more stuff to py 3.3
removed init_jinja_globals hack from app.py after consulting mitsuhiko
(didn't work on py 3.3 "as is")

removed with_statement future imports, not needed any more

needs more work on 2.7 as well as on 3.3
2013-05-22 01:33:04 +02:00
Daniel Neuhäuser
8494574fdf Merge branch 'six' of github.com:ThomasWaldmann/flask into ThomasWaldmann-six
Conflicts:
	flask/testsuite/__init__.py
2013-05-18 18:54:45 +02:00
Thomas Waldmann
cfbfff2d26 python-modernize automated changes: misc. minor stuff 2013-05-18 17:57:43 +02:00
Thomas Waldmann
6caaa8a527 automated change using python-modernize: use 'as' in except 2013-05-18 16:24:40 +02:00
Dave Shawley
8d7ca29a35 Cleaned up test case for issue #414. 2012-03-01 08:53:58 -05:00
Dave Shawley
76773e1d0a Fixed silent keyword arg to config.from_envvar.
The ``silent`` keyword argument to Config.from_envvar was not being honored
if the environment variable existed but the file that it mentioned did not.
The fix was simple - pass the keyword argument on to the underlying call to
``from_pyfile``.  I also noticed that the return value from ``from_pyfile``
was not being passed back so I fixed that as well.
2012-03-01 08:34:08 -05:00
Ron DuPlain
b786eac557 Add test for limited imp loaders, #380. 2012-01-18 18:57:05 -05:00
Ron DuPlain
fde6e364a4 Update tests for new module helpers. 2012-01-07 17:55:02 -05:00
Armin Ronacher
f01b654ac4 total_seconds -> seconds for 2.6 and earlier 2011-09-27 12:27:33 +02:00
Armin Ronacher
8da8a21b69 Moved the conversion thing into the ConfigAttribute. 2011-09-25 19:17:50 +02:00
Armin Ronacher
fbd6776e68 Fixed a bug in the testsuite that caused problems when dots where in directory names 2011-08-26 11:48:33 +01:00
Armin Ronacher
fc2caa4b9c Changed assert to self.assert_ where it was still in place 2011-08-26 11:43:27 +01:00
Armin Ronacher
3069e2d7f7 Fight the generic asserts! 2011-08-26 11:38:43 +01:00
Armin Ronacher
4cb6eea8f1 Split up testsuite and moved it to flask.testsuite. This fixes #246 2011-08-26 11:21:26 +01:00