[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Author: pre-commit-ci[bot]

modernize/fixes/fix_itertools_imports_six.py

@@ -1,4 +1,4 @@
-""" Fixer for imports of itertools.(imap|ifilter|izip|ifilterfalse) """
+"""Fixer for imports of itertools.(imap|ifilter|izip|ifilterfalse)"""
 
 from __future__ import generator_stop
 
@@ -20,9 +20,7 @@ class FixItertoolsImportsSix(fixer_base.BaseFix):
     BM_compatible = True
     PATTERN = """
               import_from< 'from' 'itertools' 'import' imports=any >
-              """ % (
-        locals()
-    )
+              """ % (locals())
 
     def transform(self, node, results):
         imports = results["imports"]

modernize/fixes/fix_itertools_six.py

@@ -1,10 +1,11 @@
-""" Fixer for itertools.(imap|ifilter|izip) -->
-    (six.moves.map|six.moves.filter|six.moves.zip) and
-    itertools.ifilterfalse --> six.moves.filterfalse (bugs 2360-2363)
-    imports from itertools are fixed in fix_itertools_imports_six.py
-    If itertools is imported as something else (ie: import itertools as it;
-    it.izip(spam, eggs)) method calls will not get fixed.
-    """
+"""Fixer for itertools.(imap|ifilter|izip) -->
+(six.moves.map|six.moves.filter|six.moves.zip) and
+itertools.ifilterfalse --> six.moves.filterfalse (bugs 2360-2363)
+imports from itertools are fixed in fix_itertools_imports_six.py
+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.
@@ -29,9 +30,7 @@ class FixItertoolsSix(fixer_base.BaseFix):
                      dot='.' func=%(it_funcs)s > trailer< '(' [any] ')' > >
               |
               power< func=%(it_funcs)s trailer< '(' [any] ')' > >
-              """ % (
-        locals()
-    )
+              """ % (locals())
 
     # Needs to be run after fix_(map|zip|filter)
     run_order = 6

modernize/fixes/fix_metaclass.py

@@ -1,19 +1,20 @@
 """Fixer for __metaclass__ = X -> (six.with_metaclass(X)) methods.
 
-   The various forms of classdef (inherits nothing, inherits once, inherits
-   many) don't parse the same in the CST, so we look at ALL classes for
-   a __metaclass__ and if we find one normalize the inherits to all be
-   an arglist.
+The various forms of classdef (inherits nothing, inherits once, inherits
+many) don't parse the same in the CST, so we look at ALL classes for
+a __metaclass__ and if we find one normalize the inherits to all be
+an arglist.
 
-   For one-liner classes ('class X: pass') there is no indent/dedent so
-   we normalize those into having a suite.
+For one-liner classes ('class X: pass') there is no indent/dedent so
+we normalize those into having a suite.
 
-   Moving the __metaclass__ into the classdef can also cause the class
-   body to be empty so there is some special casing for that as well.
+Moving the __metaclass__ into the classdef can also cause the class
+body to be empty so there is some special casing for that as well.
 
-   This fixer also tries very hard to keep original indenting and spacing
-   in all those corner cases.
+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.

modernize/fixes/fix_raise.py

@@ -17,6 +17,7 @@
    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
 

modernize/fixes/fix_raise_six.py

@@ -3,6 +3,7 @@
 raise E, V, T -> six.reraise(E, V, T)
 
 """
+
 # Author : Markus Unterwaditzer
 from __future__ import generator_stop
 

modernize/fixes/fix_urllib_six.py

@@ -1,7 +1,8 @@
 """Fix changes imports of urllib which are now incompatible.
-   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 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.
@@ -110,25 +111,19 @@ def build_pattern():
             members = alternates(members)
             yield """import_name< 'import' (module={!r}
                                   | dotted_as_names< any* module={!r} any* >) >
-                  """.format(
-                old_module, old_module
-            )
+                  """.format(old_module, old_module)
             yield """import_from< 'from' mod_member={!r} 'import'
                        ( member={} | import_as_name< member={} 'as' any > |
                          import_as_names< members=any*  >) >
-                  """.format(
-                old_module, members, members
-            )
+                  """.format(old_module, members, members)
             yield """import_from< 'from' module_star=%r 'import' star='*' >
                   """ % old_module
             yield """import_name< 'import'
                                   dotted_as_name< module_as=%r 'as' any > >
                   """ % old_module
             # bare_with_attr has a special significance for FixImports.match().
             yield """power< bare_with_attr={!r} trailer< '.' member={} > any* >
-                  """.format(
-                old_module, members
-            )
+                  """.format(old_module, members)
 
 
 class FixUrllibSix(FixImports):

modernize/main.py

@@ -18,15 +18,11 @@
 from . import __version__
 from .fixes import fissix_fix_names, opt_in_fix_names, six_fix_names
 
-usage = (
-    __doc__
-    + """\
+usage = __doc__ + """\
  %s
 
 Usage: modernize [options] file|dir ...
-"""
-    % __version__
-)
+""" % __version__
 
 
 def format_usage(usage):

tests/test_fix_imports_six.py

@@ -4,7 +4,7 @@
 import unittest
 
 try:
-    from six.moves import tkinter
+    import tkinter
 except ImportError:
     tkinter = None
 

tests/test_future_behaviour.py

@@ -66,7 +66,7 @@ def _check_on_input(file_content, extra_flags=[]):
     try:
         tmpdirname = tempfile.mkdtemp()
         test_input_name = os.path.join(tmpdirname, "input.py")
-        with open(test_input_name, "wt") as input:
+        with open(test_input_name, "w") as input:
             input.write(file_content)
         modernize_main(extra_flags + ["-w", test_input_name])
         _check_for_multiple_futures(test_input_name, file_content)
@@ -94,7 +94,7 @@ def test_two_files_on_single_run():
             os.path.join(tmpdirname, f"input_{idx}.py") for idx in range(0, 3)
         ]
         for input_name in input_names:
-            with open(input_name, "wt") as input:
+            with open(input_name, "w") as input:
                 input.write(TWO_PRINTS_CONTENT)
         modernize_main(["-w"] + input_names)
         for input_name in input_names:

tests/utils.py

@@ -23,7 +23,7 @@ def check_on_input(
     tmpdirname = tempfile.mkdtemp()
     try:
         test_input_name = os.path.join(tmpdirname, "input.py")
-        with open(test_input_name, "wt") as input_file:
+        with open(test_input_name, "w") as input_file:
             input_file.write(input_content)
 
         def _check(this_input_content, which_check, check_return_code=True):