Skip to content

Revert "Add fixer for itertools" #482

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

Merged
merged 1 commit into from
Jul 8, 2019
Merged

Revert "Add fixer for itertools" #482

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
1 change: 0 additions & 1 deletion docs/futurize.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ The complete set of fixers applied by ``futurize --stage1`` is:
lib2to3.fixes.fix_ws_comma
lib2to3.fixes.fix_xreadlines
libfuturize.fixes.fix_absolute_import
libfuturize.fixes.fix_itertools
libfuturize.fixes.fix_next_call
libfuturize.fixes.fix_print_with_import
libfuturize.fixes.fix_raise
Expand Down
6 changes: 0 additions & 6 deletions src/future/builtins/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@
import builtins
bytes = builtins.bytes
dict = builtins.dict
filter = builtins.filter
int = builtins.int
list = builtins.list
map = builtins.map
object = builtins.object
range = builtins.range
str = builtins.str
zip = builtins.zip
__all__ = []
else:
from future.types import (newbytes as bytes,
Expand All @@ -35,9 +32,6 @@
newobject as object,
newrange as range,
newstr as str)
from itertools import (ifilter as filter,
imap as map,
izip as zip)
from future import utils


Expand Down
1 change: 0 additions & 1 deletion src/libfuturize/fixes/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@

libfuturize_fix_names_stage1 = set([
'libfuturize.fixes.fix_absolute_import',
'libfuturize.fixes.fix_itertools',
'libfuturize.fixes.fix_next_call', # obj.next() -> next(obj). Unlike
# lib2to3.fixes.fix_next, doesn't change
# the ``next`` method to ``__next__``.
Expand Down
54 changes: 0 additions & 54 deletions src/libfuturize/fixes/fix_itertools.py
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions tests/test_future/test_futurize.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,81 +453,6 @@ def test_xrange(self):
"""
self.convert_check(before, after, ignore_imports=False)

def test_filter(self):
"""
Tests correct handling of itertools.ifilter
"""
before = """
import itertools
itertools.ifilter(lambda x: x%2, [1, 2, 3, 4])
"""
after = """
from builtins import filter
import itertools
filter(lambda x: x%2, [1, 2, 3, 4])
"""
self.convert_check(before, after, ignore_imports=False)
before = """
from itertools import ifilter
ifilter(lambda x: x%2, [1, 2, 3, 4])
"""
after = """
from builtins import filter

filter(lambda x: x%2, [1, 2, 3, 4])
"""
self.convert_check(before, after, ignore_imports=False)

def test_map(self):
"""
Tests correct handling of itertools.imap
"""
before = """
import itertools
itertools.imap(pow, (2,3,10), (5,2,3))
"""
after = """
from builtins import map
import itertools
map(pow, (2,3,10), (5,2,3))
"""
self.convert_check(before, after, ignore_imports=False)
before = """
from itertools import imap
imap(pow, (2,3,10), (5,2,3))
"""
after = """
from builtins import map

map(pow, (2,3,10), (5,2,3))
"""
self.convert_check(before, after, ignore_imports=False)

def test_zip(self):
"""
Tests correct handling of itertools.izip
"""
before = """
import itertools
itertools.izip('ABCD', 'xy')
"""
after = """
from builtins import zip
import itertools
zip('ABCD', 'xy')
"""
self.convert_check(before, after, ignore_imports=False)
before = """
from itertools import izip
izip('ABCD', 'xy')
"""
after = """
from builtins import zip

zip('ABCD', 'xy')
"""
self.convert_check(before, after, ignore_imports=False)

def test_source_coding_utf8(self):
"""
Tests to ensure that the source coding line is not corrupted or
Expand Down