isort remove_imports generator_stop

cclauss · cclauss · commit 97887c1a9e36 · 2022-06-27T13:42:01.000+02:00
diff --git a/docs/conf.py b/docs/conf.py
@@ -11,13 +11,10 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-from __future__ import generator_stop
 
 # -- General configuration ------------------------------------------------
-
 # If your documentation needs a minimal Sphinx version, state it here.
 # needs_sphinx = '1.0'
-
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
diff --git a/modernize/__init__.py b/modernize/__init__.py
@@ -2,6 +2,5 @@
 A hack on top of fissix (lib2to3 fork) for modernizing code for hybrid codebases.
 """
 
-from __future__ import generator_stop
 
 __version__ = "0.9rc1.dev0"
diff --git a/modernize/__main__.py b/modernize/__main__.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 import sys
 
 from .main import main
diff --git a/modernize/fixes/__init__.py b/modernize/fixes/__init__.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 fissix_fix_names = {
     "fissix.fixes.fix_apply",
     "fissix.fixes.fix_except",
diff --git a/modernize/fixes/fix_basestring.py b/modernize/fixes/fix_basestring.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, fixer_util
 
 
diff --git a/modernize/fixes/fix_classic_division.py b/modernize/fixes/fix_classic_division.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, pytree
 from fissix.pgen2 import token
 
diff --git a/modernize/fixes/fix_dict_six.py b/modernize/fixes/fix_dict_six.py
@@ -2,7 +2,6 @@
 Fixer for iterkeys() -> six.iterkeys(), and similarly for iteritems and itervalues.
 """
 
-from __future__ import generator_stop
 
 # Local imports
 from fissix import fixer_util, pytree
diff --git a/modernize/fixes/fix_file.py b/modernize/fixes/fix_file.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base
 from fissix.fixer_util import Name
 
diff --git a/modernize/fixes/fix_filter.py b/modernize/fixes/fix_filter.py
@@ -1,7 +1,6 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
 
-from __future__ import generator_stop
 
 from fissix import fixer_util
 from fissix.fixes import fix_filter
diff --git a/modernize/fixes/fix_import.py b/modernize/fixes/fix_import.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix.fixer_util import syms
 from fissix.fixes import fix_import
 
diff --git a/modernize/fixes/fix_imports_six.py b/modernize/fixes/fix_imports_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix.fixes import fix_imports
 
 
diff --git a/modernize/fixes/fix_input_six.py b/modernize/fixes/fix_input_six.py
@@ -8,7 +8,6 @@
 #     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #     2011, 2012, 2013, 2014 Python Software Foundation. All rights reserved.
 
-from __future__ import generator_stop
 
 from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Call, Name
diff --git a/modernize/fixes/fix_int_long_tuple.py b/modernize/fixes/fix_int_long_tuple.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, fixer_util
 
 
diff --git a/modernize/fixes/fix_itertools_imports_six.py b/modernize/fixes/fix_itertools_imports_six.py
@@ -1,6 +1,5 @@
 """ Fixer for imports of itertools.(imap|ifilter|izip|ifilterfalse) """
 
-from __future__ import generator_stop
 
 # Local imports
 from fissix import fixer_base, fixer_util
diff --git a/modernize/fixes/fix_itertools_six.py b/modernize/fixes/fix_itertools_six.py
@@ -5,6 +5,8 @@
     If itertools is imported as something else (ie: import itertools as it;
     it.izip(spam, eggs)) method calls will not get fixed.
     """
+
+
 # This is a derived work of Lib/lib2to3/fixes/fix_itertools_import.py. That file
 # is under the copyright of the Python Software Foundation and licensed
 # under the Python Software Foundation License 2.
@@ -13,8 +15,6 @@
 #
 #     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #     2011, 2012, 2013 Python Software Foundation. All rights reserved.
-from __future__ import generator_stop
-
 # Local imports
 from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Name
diff --git a/modernize/fixes/fix_map.py b/modernize/fixes/fix_map.py
@@ -1,7 +1,6 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
 
-from __future__ import generator_stop
 
 from fissix import fixer_util
 from fissix.fixes import fix_map
diff --git a/modernize/fixes/fix_metaclass.py b/modernize/fixes/fix_metaclass.py
@@ -14,6 +14,8 @@
    This fixer also tries very hard to keep original indenting and spacing
    in all those corner cases.
 """
+
+
 # This is a derived work of Lib/lib2to3/fixes/fix_metaclass.py. That file
 # is under the copyright of the Python Software Foundation and licensed
 # under the Python Software Foundation License 2.
@@ -22,8 +24,6 @@
 #
 #     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #     2011, 2012, 2013 Python Software Foundation. All rights reserved.
-from __future__ import generator_stop
-
 # Local imports
 from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Call, Comma, Leaf, Name, Node, syms
diff --git a/modernize/fixes/fix_next.py b/modernize/fixes/fix_next.py
@@ -1,6 +1,5 @@
 """Fixer for it.next() -> next(it)"""
 
-from __future__ import generator_stop
 
 # Local imports
 from fissix import fixer_base
diff --git a/modernize/fixes/fix_open.py b/modernize/fixes/fix_open.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, fixer_util
 
 
diff --git a/modernize/fixes/fix_print.py b/modernize/fixes/fix_print.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix.fixes import fix_print
 
 from .. import utils
diff --git a/modernize/fixes/fix_raise.py b/modernize/fixes/fix_raise.py
@@ -17,9 +17,9 @@
    any client code would have to be changed as well, we don't automate
    this.
 """
-# Author: Collin Winter, Armin Ronacher
-from __future__ import generator_stop
 
+
+# Author: Collin Winter, Armin Ronacher
 from fissix.fixes import fix_raise
 
 
diff --git a/modernize/fixes/fix_raise_six.py b/modernize/fixes/fix_raise_six.py
@@ -3,9 +3,9 @@
 raise E, V, T -> six.reraise(E, V, T)
 
 """
-# Author : Markus Unterwaditzer
-from __future__ import generator_stop
 
+
+# Author : Markus Unterwaditzer
 # Local imports
 from fissix import fixer_base, fixer_util
 from fissix.fixer_util import Call, Comma, Name
diff --git a/modernize/fixes/fix_unichr.py b/modernize/fixes/fix_unichr.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, fixer_util
 from fissix.fixer_util import is_probably_builtin
 
diff --git a/modernize/fixes/fix_unicode.py b/modernize/fixes/fix_unicode.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 import re
 
 from fissix import fixer_base, fixer_util
diff --git a/modernize/fixes/fix_unicode_future.py b/modernize/fixes/fix_unicode_future.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix.fixes import fix_unicode
 
 from .. import utils
diff --git a/modernize/fixes/fix_unicode_type.py b/modernize/fixes/fix_unicode_type.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_base, fixer_util
 
 
diff --git a/modernize/fixes/fix_urllib_six.py b/modernize/fixes/fix_urllib_six.py
@@ -2,6 +2,8 @@
    This is a copy of Lib/lib2to3/fixes/fix_urllib.py, but modified to point to the
    six.moves locations for new libraries instead of the Python 3 locations.
 """
+
+
 # This is a derived work of Lib/lib2to3/fixes/fix_urllib.py. That file
 # is under the copyright of the Python Software Foundation and licensed
 # under the Python Software Foundation License 2.
@@ -10,8 +12,6 @@
 #
 #     Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #     2011, 2012, 2013 Python Software Foundation. All rights reserved.
-from __future__ import generator_stop
-
 from fissix.fixer_util import (
     Comma,
     FromImport,
diff --git a/modernize/fixes/fix_xrange_six.py b/modernize/fixes/fix_xrange_six.py
@@ -1,7 +1,6 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
 
-from __future__ import generator_stop
 
 from fissix import fixer_base, fixer_util
 from fissix.fixes import fix_xrange
diff --git a/modernize/fixes/fix_zip.py b/modernize/fixes/fix_zip.py
@@ -1,7 +1,6 @@
 # Copyright 2008 Armin Ronacher.
 # Licensed to PSF under a Contributor Agreement.
 
-from __future__ import generator_stop
 
 from fissix import fixer_util
 from fissix.fixes import fix_zip
diff --git a/modernize/main.py b/modernize/main.py
@@ -5,7 +5,6 @@
   |_|_|_\\___/\\__,_\\___|_| |_||_|_/__\\___|\
 """
 
-from __future__ import generator_stop
 
 import logging
 import optparse
diff --git a/modernize/utils.py b/modernize/utils.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from fissix import fixer_util
 from fissix.pgen2 import token
 from fissix.pygram import python_symbols as syms
diff --git a/pyproject.toml b/pyproject.toml
@@ -20,7 +20,7 @@ classifiers = [
 ]
 description-file = "README.rst"
 requires = ["fissix"]
-requires-python = "~=3.6"
+requires-python = "~=3.7"
 
 [tool.flit.metadata.requires-extra]
 docs = [
@@ -43,7 +43,7 @@ python-modernize = "modernize.main:main"
 
 [tool.isort]
 profile = "black"
-add_imports=["from __future__ import generator_stop"]
+remove_imports=["from __future__ import generator_stop"]
 
 [tool.pytest.ini_options]
 addopts = [
diff --git a/tests/test_fix_basestring.py b/tests/test_fix_basestring.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 BASESTRING = (
diff --git a/tests/test_fix_classic_division.py b/tests/test_fix_classic_division.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 CLASSIC_DIVISION = (
diff --git a/tests/test_fix_dict_six.py b/tests/test_fix_dict_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 TYPES = "keys", "items", "values"
diff --git a/tests/test_fix_file.py b/tests/test_fix_file.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 FILE_CALL = (
diff --git a/tests/test_fix_filter.py b/tests/test_fix_filter.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 FILTER_CALL = (
diff --git a/tests/test_fix_import.py b/tests/test_fix_import.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 NO_IMPORTS = (
diff --git a/tests/test_fix_imports_six.py b/tests/test_fix_imports_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 import sys
 import unittest
 
diff --git a/tests/test_fix_input_six.py b/tests/test_fix_input_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 INPUT = (
diff --git a/tests/test_fix_int_long_tuple.py b/tests/test_fix_int_long_tuple.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 INT_LONG_ISINSTANCE = (
diff --git a/tests/test_fix_itertools_imports_six.py b/tests/test_fix_itertools_imports_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 IZIP_AND_CHAIN_REFERENCE = (
diff --git a/tests/test_fix_map.py b/tests/test_fix_map.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 MAP_1_ARG = (
diff --git a/tests/test_fix_metaclass.py b/tests/test_fix_metaclass.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 METACLASS_NO_BASE = (
diff --git a/tests/test_fix_next.py b/tests/test_fix_next.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 NEXT_METHOD = (
diff --git a/tests/test_fix_open.py b/tests/test_fix_open.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 OPEN = (
diff --git a/tests/test_fix_print.py b/tests/test_fix_print.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 PRINT_BARE = (
diff --git a/tests/test_fix_raise.py b/tests/test_fix_raise.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 RAISE = (
diff --git a/tests/test_fix_unichr_type.py b/tests/test_fix_unichr_type.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 UNICHR_METHOD_REF = (
diff --git a/tests/test_fix_unicode.py b/tests/test_fix_unicode.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 UNICODE_LITERALS = """\
diff --git a/tests/test_fix_unicode_type.py b/tests/test_fix_unicode_type.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 UNICODE_TYPE_REF = (
diff --git a/tests/test_fix_urllib_six.py b/tests/test_fix_urllib_six.py
@@ -1,5 +1,3 @@
-from __future__ import generator_stop
-
 from utils import check_on_input
 
 URLLIB_MODULE_REFERENCE = (
diff --git a/tests/test_fix_xrange_six.py b/tests/test_fix_xrange_six.py
diff --git a/tests/test_fix_zip.py b/tests/test_fix_zip.py
diff --git a/tests/test_fixes.py b/tests/test_fixes.py
diff --git a/tests/test_future_behaviour.py b/tests/test_future_behaviour.py
diff --git a/tests/test_main.py b/tests/test_main.py
diff --git a/tests/test_raise_six.py b/tests/test_raise_six.py
diff --git a/tests/utils.py b/tests/utils.py

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`import sys`
`4`	`2`
`5`	`3`	`from .main import main`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`fissix_fix_names = {`
`4`	`2`	`"fissix.fixes.fix_apply",`
`5`	`3`	`"fissix.fixes.fix_except",`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`from fissix import fixer_base, fixer_util`
`4`	`2`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`from fissix import fixer_base, pytree`
`4`	`2`	`from fissix.pgen2 import token`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`from fissix import fixer_base`
`4`	`2`	`from fissix.fixer_util import Name`
`5`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-from __future__ import generator_stop`
`2`		`-`
`3`	`1`	`from fissix.fixer_util import syms`
`4`	`2`	`from fissix.fixes import fix_import`
`5`	`3`