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

Add test and logic for attribute access calls

Browse source
This commit is contained in:
Keyan Pishdadian 2015-02-13 18:40:41 -05:00
parent 77ed466101
commit cd6ec40947
2 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

24
scripts/flaskext_migrate.py
View file

@ -76,9 +76,12 @@ def fix_standard_imports(red):
try: try:
if (node.value[0].value[0].value == 'flask' and if (node.value[0].value[0].value == 'flask' and
node.value[0].value[1].value == 'ext'): node.value[0].value[1].value == 'ext'):
package = node.value[0].value[2] package = node.value[0].value[2].value
name = node.names()[0].split('.')[-1] name = node.names()[0].split('.')[-1]
node.replace("import flask_%s as %s" % (package, name)) if name == package:
node.replace("import flask_%s" % (package))
else:
node.replace("import flask_%s as %s" % (package, name))
except IndexError: except IndexError:
pass pass
@ -113,13 +116,28 @@ def fix_function_calls(red):
try: try:
if (node.value[0].value == 'flask' and if (node.value[0].value == 'flask' and
node.value[1].value == 'ext'): node.value[1].value == 'ext'):
node.replace("flask_%s%s" % (node.value[3], node.value[3])) params = _form_function_call(node)
node.replace("flask_%s%s" % (node.value[2], params))
except IndexError: except IndexError:
pass pass
return red return red
def _form_function_call(node):
"""
Reconstructs function call strings when making attribute access calls.
"""
node_vals = node.value
output = "."
for x, param in enumerate(node_vals[3::]):
if param.dumps()[0] == "(":
output = output[0:-1] + param.dumps()
return output
else:
output += param.dumps() + "."
def check_user_input(): def check_user_input():
"""Exits and gives error message if no argument is passed in the shell.""" """Exits and gives error message if no argument is passed in the shell."""
if len(sys.argv) < 2: if len(sys.argv) < 2:

10
scripts/test_import_migration.py
View file

@ -36,7 +36,7 @@ def test_multiline_import():
def test_module_import(): def test_module_import():
red = RedBaron("import flask.ext.foo") red = RedBaron("import flask.ext.foo")
output = migrate.fix_tester(red) output = migrate.fix_tester(red)
assert output == "import flask_foo as foo" assert output == "import flask_foo"
def test_named_module_import(): def test_named_module_import():
@ -61,3 +61,11 @@ def test_function_call_migration():
red = RedBaron("flask.ext.foo(var)") red = RedBaron("flask.ext.foo(var)")
output = migrate.fix_tester(red) output = migrate.fix_tester(red)
assert output == "flask_foo(var)" assert output == "flask_foo(var)"
def test_nested_function_call_migration():
red = RedBaron("import flask.ext.foo\n\n"
"flask.ext.foo.bar(var)")
output = migrate.fix_tester(red)
assert output == ("import flask_foo\n\n"
"flask_foo.bar(var)")