upgrade hooks, pyupgrade pre-commit

pre_commit/languages/all.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pre_commit.languages import conda
 from pre_commit.languages import docker
 from pre_commit.languages import docker_image

pre_commit/languages/conda.py

@@ -53,7 +53,7 @@ def install_environment(prefix, version, additional_dependencies):
         if additional_dependencies:
             cmd_output_b(
                 'conda', 'install', '-p', env_dir, *additional_dependencies,
-                cwd=prefix.prefix_dir
+                cwd=prefix.prefix_dir,
             )
 
 

pre_commit/languages/docker.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import hashlib
 import os
 
@@ -24,7 +21,7 @@ def md5(s):  # pragma: windows no cover
 
 def docker_tag(prefix):  # pragma: windows no cover
     md5sum = md5(os.path.basename(prefix.prefix_dir)).lower()
-    return 'pre-commit-{}'.format(md5sum)
+    return f'pre-commit-{md5sum}'
 
 
 def docker_is_running():  # pragma: windows no cover

pre_commit/languages/docker_image.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 from pre_commit.languages import helpers
 from pre_commit.languages.docker import assert_docker_available
 from pre_commit.languages.docker import docker_cmd

pre_commit/languages/fail.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pre_commit.languages import helpers
 
 

pre_commit/languages/golang.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import contextlib
 import os.path
 import sys

pre_commit/languages/helpers.py

@@ -1,11 +1,7 @@
-from __future__ import unicode_literals
-
 import multiprocessing
 import os
 import random
 
-import six
-
 import pre_commit.constants as C
 from pre_commit.util import cmd_output_b
 from pre_commit.xargs import xargs
@@ -21,13 +17,13 @@ def environment_dir(ENVIRONMENT_DIR, language_version):
     if ENVIRONMENT_DIR is None:
         return None
     else:
-        return '{}-{}'.format(ENVIRONMENT_DIR, language_version)
+        return f'{ENVIRONMENT_DIR}-{language_version}'
 
 
 def assert_version_default(binary, version):
     if version != C.DEFAULT:
         raise AssertionError(
-            'For now, pre-commit requires system-installed {}'.format(binary),
+            f'For now, pre-commit requires system-installed {binary}',
         )
 
 
@@ -68,10 +64,7 @@ def target_concurrency(hook):
 def _shuffled(seq):
     """Deterministically shuffle identically under both py2 + py3."""
     fixed_random = random.Random()
-    if six.PY2:  # pragma: no cover (py2)
-        fixed_random.seed(FIXED_RANDOM_SEED)
-    else:  # pragma: no cover (py3)
-        fixed_random.seed(FIXED_RANDOM_SEED, version=1)
+    fixed_random.seed(FIXED_RANDOM_SEED, version=1)
 
     seq = list(seq)
     random.shuffle(seq, random=fixed_random.random)

pre_commit/languages/node.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import contextlib
 import os
 import sys

pre_commit/languages/pygrep.py

@@ -1,6 +1,3 @@
-from __future__ import absolute_import
-from __future__ import unicode_literals
-
 import argparse
 import re
 import sys
@@ -22,7 +19,7 @@ def _process_filename_by_line(pattern, filename):
         for line_no, line in enumerate(f, start=1):
             if pattern.search(line):
                 retv = 1
-                output.write('{}:{}:'.format(filename, line_no))
+                output.write(f'{filename}:{line_no}:')
                 output.write_line(line.rstrip(b'\r\n'))
     return retv
 

pre_commit/languages/python.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import contextlib
 import os
 import sys

pre_commit/languages/python_venv.py

@@ -1,7 +1,4 @@
-from __future__ import unicode_literals
-
 import os.path
-import sys
 
 from pre_commit.languages import python
 from pre_commit.util import CalledProcessError
@@ -13,10 +10,7 @@ ENVIRONMENT_DIR = 'py_venv'
 
 
 def get_default_version():  # pragma: no cover (version specific)
-    if sys.version_info < (3,):
-        return 'python3'
-    else:
-        return python.get_default_version()
+    return python.get_default_version()
 
 
 def orig_py_exe(exe):  # pragma: no cover (platform specific)

pre_commit/languages/ruby.py

@@ -1,7 +1,4 @@
-from __future__ import unicode_literals
-
 import contextlib
-import io
 import os.path
 import shutil
 import tarfile
@@ -66,7 +63,7 @@ def _install_rbenv(prefix, version=C.DEFAULT):  # pragma: windows no cover
         _extract_resource('ruby-build.tar.gz', plugins_dir)
 
     activate_path = prefix.path(directory, 'bin', 'activate')
-    with io.open(activate_path, 'w') as activate_file:
+    with open(activate_path, 'w') as activate_file:
         # This is similar to how you would install rbenv to your home directory
         # However we do a couple things to make the executables exposed and
         # configure it to work in our directory.
@@ -86,7 +83,7 @@ def _install_rbenv(prefix, version=C.DEFAULT):  # pragma: windows no cover
 
         # If we aren't using the system ruby, add a version here
         if version != C.DEFAULT:
-            activate_file.write('export RBENV_VERSION="{}"\n'.format(version))
+            activate_file.write(f'export RBENV_VERSION="{version}"\n')
 
 
 def _install_ruby(prefix, version):  # pragma: windows no cover

pre_commit/languages/rust.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import contextlib
 import os.path
 
@@ -85,7 +83,7 @@ def install_environment(prefix, version, additional_dependencies):
         for package in packages_to_install:
             cmd_output_b(
                 'cargo', 'install', '--bins', '--root', directory, *package,
-                cwd=prefix.prefix_dir
+                cwd=prefix.prefix_dir,
             )
 
 

pre_commit/languages/script.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pre_commit.languages import helpers
 
 

pre_commit/languages/swift.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 import contextlib
 import os
 

pre_commit/languages/system.py

@@ -1,5 +1,3 @@
-from __future__ import unicode_literals
-
 from pre_commit.languages import helpers