orbit-oss/flask
4
4
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'config-support' of github.com:mitsuhiko/flask into config-support

Browse source 
Conflicts:
	flask.py
	tests/flask_tests.py
This commit is contained in:
Armin Ronacher 2010-05-27 13:34:56 +02:00
commit 672eaf7abf
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/flask_tests.py
View file

@ -703,7 +703,7 @@ class ConfigTestCase(unittest.TestCase):
app.config.from_pyfile('flask_tests.py')
self.common_object_test(app)
def test_config_from_module(self):
def test_config_from_object(self):
app = flask.Flask(__name__)
app.config.from_object(__name__)
self.common_object_test(app)