Compare commits

...

5 commits
main ... 0.3.1

Author SHA1 Message Date
Armin Ronacher
6b3e616cf9 Fixed build process 2010-05-28 21:21:28 +02:00
Armin Ronacher
bf2b2f25f9 Added missing message 2010-05-28 21:07:28 +02:00
Armin Ronacher
a1cd92e459 Removed some unused code 2010-05-28 21:07:06 +02:00
Armin Ronacher
218178164f Fixed an error reporting bug with flask.Config.from_envvar 2010-05-28 21:06:39 +02:00
Armin Ronacher
2e83bd1f50 This branch will be 0.3.1 2010-05-28 20:48:21 +02:00
5 changed files with 41 additions and 8 deletions

11
CHANGES
View file

@ -8,6 +8,17 @@ Version 0.4
Release date to be announced, codename to be selected. Release date to be announced, codename to be selected.
Version 0.3.1
-------------
Bugfix release, released May 28th
- fixed a error reporting bug with :meth:`flask.Config.from_envvar`
- removed some unused code from flask
- release does no longer include development leftover files (.git
folder for themes, built documentation in zip and pdf file and
some .pyc files)
Version 0.3 Version 0.3
----------- -----------

View file

@ -1,4 +1,10 @@
include Makefile CHANGES LICENSE AUTHORS include Makefile CHANGES LICENSE AUTHORS
recursive-include tests * recursive-include tests *
recursive-include examples *
recursive-include docs * recursive-include docs *
prune docs/_build/doctrees recursive-exclude docs *.pyc
recursive-exclude docs *.pyo
recursive-exclude examples *.pyc
recursive-exclude examples *.pyo
prune docs/_build
prune docs/_themes/.git

View file

@ -698,7 +698,8 @@ class Config(dict):
raise RuntimeError('The environment variable %r is not set ' raise RuntimeError('The environment variable %r is not set '
'and as such configuration could not be ' 'and as such configuration could not be '
'loaded. Set this variable and make it ' 'loaded. Set this variable and make it '
'point to a configuration file') 'point to a configuration file' %
variable_name)
self.from_pyfile(rv) self.from_pyfile(rv)
return True return True
@ -1423,8 +1424,3 @@ current_app = LocalProxy(lambda: _request_ctx_stack.top.app)
request = LocalProxy(lambda: _request_ctx_stack.top.request) request = LocalProxy(lambda: _request_ctx_stack.top.request)
session = LocalProxy(lambda: _request_ctx_stack.top.session) session = LocalProxy(lambda: _request_ctx_stack.top.session)
g = LocalProxy(lambda: _request_ctx_stack.top.g) g = LocalProxy(lambda: _request_ctx_stack.top.g)
# script interface to run a development server
if __name__ == '__main__':
sys.exit(main(sys.argv))

View file

@ -43,7 +43,7 @@ from setuptools import setup
setup( setup(
name='Flask', name='Flask',
version='0.4', version='0.3.1',
url='http://github.com/mitsuhiko/flask/', url='http://github.com/mitsuhiko/flask/',
license='BSD', license='BSD',
author='Armin Ronacher', author='Armin Ronacher',

View file

@ -717,6 +717,26 @@ class ConfigTestCase(unittest.TestCase):
app.config.from_object(Test) app.config.from_object(Test)
self.common_object_test(app) self.common_object_test(app)
def test_config_from_envvar(self):
import os
env = os.environ
try:
os.environ = {}
app = flask.Flask(__name__)
try:
app.config.from_envvar('FOO_SETTINGS')
except RuntimeError, e:
assert "'FOO_SETTINGS' is not set" in str(e)
else:
assert 0, 'expected exception'
not app.config.from_envvar('FOO_SETTINGS', silent=True)
os.environ = {'FOO_SETTINGS': 'flask_tests.py'}
assert app.config.from_envvar('FOO_SETTINGS')
self.common_object_test(app)
finally:
os.environ = env
def suite(): def suite():
from minitwit_tests import MiniTwitTestCase from minitwit_tests import MiniTwitTestCase