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

Merge pull request #1358 from keyanp/ext_migrate_fix

Browse source 
Add skip to fix unnoticed bug with import migration tool
This commit is contained in:
Markus Unterwaditzer 2015-02-26 10:43:34 +01:00
commit 3740ae492f
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/flaskext_migrate.py
View file

@ -40,6 +40,8 @@ def fix_from_imports(red):
from_imports = red.find_all("FromImport") from_imports = red.find_all("FromImport")
for x, node in enumerate(from_imports): for x, node in enumerate(from_imports):
values = node.value values = node.value
if len(values) < 2:
continue
if (values[0].value == 'flask') and (values[1].value == 'ext'): if (values[0].value == 'flask') and (values[1].value == 'ext'):
# Case 1 # Case 1
if len(node.value) == 3: if len(node.value) == 3:

8
scripts/test_import_migration.py
View file

@ -45,7 +45,7 @@ def test_named_module_import():
assert output == "import flask_foo as foobar" assert output == "import flask_foo as foobar"
def test__named_from_import(): def test_named_from_import():
red = RedBaron("from flask.ext.foo import bar as baz") red = RedBaron("from flask.ext.foo import bar as baz")
output = migrate.fix_tester(red) output = migrate.fix_tester(red)
assert output == "from flask_foo import bar as baz" assert output == "from flask_foo import bar as baz"
@ -69,3 +69,9 @@ def test_nested_function_call_migration():
output = migrate.fix_tester(red) output = migrate.fix_tester(red)
assert output == ("import flask_foo\n\n" assert output == ("import flask_foo\n\n"
"flask_foo.bar(var)") "flask_foo.bar(var)")
def test_no_change_to_import():
red = RedBaron("from flask import Flask")
output = migrate.fix_tester(red)
assert output == "from flask import Flask"