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
