maya-chen/flask
1
0
Fork 0
forked from orbit-oss/flask
Code Pull requests Activity

ignore colon with slash when split app_import_path

Browse source 
Flask currently supports importing app through a combination of module
path and app variable name, such as '/usr/app.py:my_app'. When the
module path contains a colon, it will conflict with this import way and
a `flask.cli.NoAppException` will be raised.

A file path on a Windows system may contain a colon followed by a slash.
So we solved this problem on Windows by ignoring the colon followed by a
slash when we split app_import_path.

Fix issue #2961.
This commit is contained in:
garenchan 2018-10-24 21:13:11 +08:00
parent 363205bdc3
commit c38499bbf2
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tests/test_cli.py
View file

@ -261,8 +261,21 @@ def test_get_version(test_apps, capsys):
def test_scriptinfo(test_apps, monkeypatch):
"""Test of ScriptInfo."""
obj = ScriptInfo(app_import_path="cliapp.app:testapp")
assert obj.load_app().name == "testapp"
assert obj.load_app().name == "testapp"
app = obj.load_app()
assert app.name == "testapp"
assert obj.load_app() is app
# import app with module's absolute path
cli_app_path = os.path.abspath(os.path.join(
os.path.dirname(__file__), 'test_apps', 'cliapp', 'app.py'))
obj = ScriptInfo(app_import_path=cli_app_path)
app = obj.load_app()
assert app.name == 'testapp'
assert obj.load_app() is app
obj = ScriptInfo(app_import_path=cli_app_path + ':testapp')
app = obj.load_app()
assert app.name == 'testapp'
assert obj.load_app() is app
def create_app(info):
return Flask("createapp")
@ -270,7 +283,7 @@ def test_scriptinfo(test_apps, monkeypatch):
obj = ScriptInfo(create_app=create_app)
app = obj.load_app()
assert app.name == "createapp"
assert obj.load_app() == app
assert obj.load_app() is app
obj = ScriptInfo()
pytest.raises(NoAppException, obj.load_app)