Browse Source

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

Conflicts:
	flask.py
	tests/flask_tests.py
pull/1638/head
Armin Ronacher 15 years ago
parent
commit
672eaf7abf
  1. 2
      tests/flask_tests.py

2
tests/flask_tests.py

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

Loading…
Cancel
Save