Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix future import ordering #446

Merged
merged 1 commit into from
May 6, 2019
Merged

Fix future import ordering #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/future/tests/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,11 @@ def convert_check(self, before, expected, stages=(1, 2), all_imports=False,
else:
headers = ''

self.compare(output, headers + reformat_code(expected),
reformatted = reformat_code(expected)
if headers in reformatted:
headers = ''

self.compare(output, headers + reformatted,
ignore_imports=ignore_imports)

def unchanged(self, code, **kwargs):
Expand Down
4 changes: 2 additions & 2 deletions src/libfuturize/fixes/fix_add__future__imports_except_unicode_literals.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ class FixAddFutureImportsExceptUnicodeLiterals(fixer_base.BaseFix):

def transform(self, node, results):
# Reverse order:
future_import(u"print_function", node)
future_import(u"division", node)
future_import(u"absolute_import", node)
future_import(u"division", node)
future_import(u"print_function", node)
6 changes: 3 additions & 3 deletions src/libpasteurize/fixes/fix_add_all__future__imports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class FixAddAllFutureImports(fixer_base.BaseFix):
run_order = 1

def transform(self, node, results):
future_import(u"unicode_literals", node)
future_import(u"print_function", node)
future_import(u"division", node)
future_import(u"absolute_import", node)
future_import(u"division", node)
future_import(u"print_function", node)
future_import(u"unicode_literals", node)
11 changes: 6 additions & 5 deletions tests/test_future/test_futurize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1361,6 +1361,7 @@ def test_open(self):
"""
self.convert_check(before, after, conservative=True)


class TestFuturizeAllImports(CodeHandler):
"""
Tests "futurize --all-imports".
Expand All @@ -1378,14 +1379,14 @@ def test_all_imports(self):
print('Hello')
"""
after = """
from __future__ import unicode_literals
from __future__ import print_function
from __future__ import division
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
from __future__ import unicode_literals
from future import standard_library
standard_library.install_aliases()
from builtins import range
from builtins import *
from builtins import range
import math
import os
l = list(range(10))
Expand All @@ -1395,7 +1396,7 @@ def test_all_imports(self):
pass
print('Hello')
"""
self.convert_check(before, after, all_imports=True)
self.convert_check(before, after, all_imports=True, ignore_imports=False)


if __name__ == '__main__':
Expand Down