Commit graph

35 commits

Author SHA1 Message Date
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
Parkayun
33534bb4a9 Happy New Year 2015 2015-01-02 11:35:00 +09:00
defuz
8284217593 docs: `True, False and None` 2014-11-05 06:04:58 +03:00
Bryan Stitt
bbd9c2f100 Update config.py 2014-10-24 13:11:10 +04:00
Bryan Stitt
56a7e8361d Update config.py
I want to load all of my `CELERY_` options from the config and leave `CELERY_` on there.
2014-10-24 13:11:10 +04:00
Daniel Neuhäuser
486c1089b0 Base from_json on from_mapping 2014-07-27 13:21:14 +02:00
Daniel Neuhäuser
aa40b1731e Add Config.from_mapping 2014-07-27 13:09:14 +02: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
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
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
Matt Wright
b290bf4079 Add ability to config from a JSON file 2013-08-07 18:03:37 -04:00
Thomas Waldmann
96b8ffbb29 always import from ._compat 2013-05-25 20:24:14 +02:00
Daniel Neuhäuser
43b6d0a6d0 Ensure that config file is closed immediately 2013-05-22 22:49:25 +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
05923f7f2f Merge branch 'exec' of github.com:ThomasWaldmann/flask into sprint-branch
Conflicts:
	flask/config.py
2013-05-18 17:32:38 +02:00
Thomas Waldmann
b52b7b1f93 automated change using python-modernize: replace execfile 2013-05-18 16:31:40 +02:00
Thomas Waldmann
6caaa8a527 automated change using python-modernize: use 'as' in except 2013-05-18 16:24:40 +02: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
Armin Ronacher
8da8a21b69 Moved the conversion thing into the ConfigAttribute. 2011-09-25 19:17:50 +02:00
Armin Ronacher
ee8417dac8 Late but 2010 -> 2011 in some files 2011-09-01 16:57:00 +02:00
Armin Ronacher
2866ccda1f Switch to explicit Werkzeug imports 2011-07-15 18:03:48 +02:00
Ron DuPlain
ea77d5e12d Touch up docs according to user feedback. 2011-05-19 09:14:53 -04:00
Aaron Kavlie
67581795c4 Improved botched docstring wording for silent failure.
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
2011-03-15 12:19:05 -04:00
Armin Ronacher
235369fd61 Removed unnecessary import 2011-03-14 14:21:44 -04:00
Armin Ronacher
34a494713c Documented some changes in config handling. 2011-03-14 14:21:28 -04:00
Aaron Kavlie
fa9817778c Test passes.
Added test for silent flag; added import of errno so it passed.
2011-03-14 10:41:22 -04:00
Aaron Kavlie
5cc40f4728 silent option added to 'from_pyfile' to mirror 'from_envvar'. 2011-03-14 10:36:33 -04:00
Jeff Weber
405c2992f8 Updated from_pyfile so its dynamic module creation uses the imp module instead of type.
Signed-off-by: Armin Ronacher <armin.ronacher@active-4.com>
2010-10-19 09:09:58 +02:00
Armin Ronacher
778e44e39e Improved error message for configuration files 2010-07-30 00:03:06 +02:00
Armin Ronacher
b551f15b22 Restored 2.5 compatibility{ 2010-07-04 14:17:29 +02:00
Armin Ronacher
4f8ee8f129 Added missing comments, fixed setup.py and made tests pass 2010-07-04 11:35:20 +02:00
Renamed from flask/conf.py (Browse further)