Run the whole codebase against pyupgrade

.github/workflows/testing.yml

@@ -10,7 +10,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v1
       with:
-        python-version: 3.5
+        python-version: 3.7
     - name: Set Cache Key
       run: echo "::set-env name=PY::$(python --version --version | sha256sum | cut -d' ' -f1)"
     - uses: actions/cache@v1

.pre-commit-config.yaml

@@ -13,6 +13,13 @@ repos:
       - id: check-merge-conflict  # Check for files that contain merge conflict strings.
       - id: check-ast             # Simply check whether files parse as valid python.
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.7.0
+    hooks:
+      - id: pyupgrade
+        name: Rewrite Code to be Py3.5+
+        args: [--py3-plus]
+
   - repo: https://github.com/asottile/reorder_python_imports
     rev: v1.9.0
     hooks:

.pylintrc

@@ -20,7 +20,6 @@ persistent=yes
 # List of plugins (as comma separated values of python modules names) to load,
 # usually to register additional checkers.
 load-plugins=saltpylint.pep8,
-  saltpylint.pep263,
   saltpylint.strings,
   saltpylint.fileperms,
   saltpylint.smartup,

docs/conf.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Configuration file for the Sphinx documentation builder.
 #
 # This file only contains a selection of the most common options. For a full

noxfile.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import datetime
 import json
 import os

saltfactories/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 NG PyTest Salt Plugin
 """

saltfactories/_version.py

@@ -12,7 +12,6 @@
 
 """Git implementation of _version.py."""
 
-from __future__ import absolute_import, print_function, unicode_literals
 import errno
 import os
 import re
@@ -84,7 +83,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
                                  stderr=(subprocess.PIPE if hide_stderr
                                          else None))
             break
-        except EnvironmentError:
+        except OSError:
             e = sys.exc_info()[1]
             if e.errno == errno.ENOENT:
                 continue
@@ -94,7 +93,7 @@ def run_command(commands, args, cwd=None, verbose=False, hide_stderr=False,
             return None, None
     else:
         if verbose:
-            print("unable to find command, tried %s" % (commands,))
+            print("unable to find command, tried {}".format(commands))
         return None, None
     stdout = p.communicate()[0].strip()
     if sys.version_info[0] >= 3:
@@ -141,7 +140,7 @@ def git_get_keywords(versionfile_abs):
     # _version.py.
     keywords = {}
     try:
-        f = open(versionfile_abs, "r")
+        f = open(versionfile_abs)
         for line in f.readlines():
             if line.strip().startswith("git_refnames ="):
                 mo = re.search(r'=\s*"(.*)"', line)
@@ -156,7 +155,7 @@ def git_get_keywords(versionfile_abs):
                 if mo:
                     keywords["date"] = mo.group(1)
         f.close()
-    except EnvironmentError:
+    except OSError:
         pass
     return keywords
 
@@ -180,11 +179,11 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         if verbose:
             print("keywords are unexpanded, not using")
         raise NotThisMethod("unexpanded keywords, not a git-archive tarball")
-    refs = set([r.strip() for r in refnames.strip("()").split(",")])
+    refs = {r.strip() for r in refnames.strip("()").split(",")}
     # starting in git-1.8.3, tags are listed as "tag: foo-1.0" instead of
     # just "foo-1.0". If we see a "tag: " prefix, prefer those.
     TAG = "tag: "
-    tags = set([r[len(TAG):] for r in refs if r.startswith(TAG)])
+    tags = {r[len(TAG):] for r in refs if r.startswith(TAG)}
     if not tags:
         # Either we're using git < 1.8.3, or there really are no tags. We use
         # a heuristic: assume all version tags have a digit. The old git %d
@@ -193,7 +192,7 @@ def git_versions_from_keywords(keywords, tag_prefix, verbose):
         # between branches and tags. By ignoring refnames without digits, we
         # filter out many common branch names like "release" and
         # "stabilization", as well as "HEAD" and "master".
-        tags = set([r for r in refs if re.search(r'\d', r)])
+        tags = {r for r in refs if re.search(r'\d', r)}
         if verbose:
             print("discarding '%s', no digits" % ",".join(refs - tags))
     if verbose:

saltfactories/exceptions.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.exceptions
 ~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/factories/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

saltfactories/factories/manager.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.factories.manager
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -32,7 +31,7 @@
 from saltfactories.utils.ports import get_unused_localhost_port
 
 
-class SaltFactoriesManager(object):
+class SaltFactoriesManager:
     """
     The :class:`SaltFactoriesManager` is responsible for configuring and spawning Salt Daemons and
     making sure that any salt CLI tools are "targetted" to the right daemon.

saltfactories/factories/master.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.factories.master
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,7 +18,7 @@
 from saltfactories.utils import ports
 
 
-class MasterFactory(object):
+class MasterFactory:
     @staticmethod
     def default_config(
         root_dir, master_id, config_defaults=None, config_overrides=None, order_masters=False,

saltfactories/factories/minion.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.factories.minion
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,7 +18,7 @@
 from saltfactories.utils import ports
 
 
-class MinionFactory(object):
+class MinionFactory:
     @staticmethod
     def default_config(
         root_dir, minion_id, config_defaults=None, config_overrides=None, master_port=None

saltfactories/factories/proxy.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.factories.proxy
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,7 +18,7 @@
 from saltfactories.utils import ports
 
 
-class ProxyMinionFactory(object):
+class ProxyMinionFactory:
     @staticmethod
     def default_config(
         root_dir, proxy_minion_id, config_defaults=None, config_overrides=None, master_port=None,

saltfactories/factories/syndic.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.factories.minion
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -19,7 +18,7 @@
 from saltfactories.utils import ports
 
 
-class SyndicFactory(object):
+class SyndicFactory:
     @staticmethod
     def default_config(
         root_dir,

saltfactories/hookspec.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.hookspec
 ~~~~~~~~~~~~~~~~~~~~~~

saltfactories/plugin.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.plugin
 ~~~~~~~~~~~~~~~~~~~~

saltfactories/plugins/__init__.py

@@ -1 +0,0 @@
-# -*- coding: utf-8 -*-

saltfactories/plugins/factories.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.plugins.factories
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/plugins/markers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.plugins.markers
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/plugins/sysinfo.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.plugins.sysinfo
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/plugins/sysstats.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.plugins.sysstats
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/utils/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils
 ~~~~~~~~~~~~~~~~~~~

saltfactories/utils/cli_scripts.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.cli_scripts
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/utils/compat.py

@@ -1,25 +1,9 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.compat
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Imports compatability layer
 """
-import sys
-import weakref
-
-# pragma: no cover
-# pylint: disable=unused-import,invalid-name
-try:
-    from unittest import mock
-except ImportError:
-    import mock
-
-if sys.version_info < (3,):
-    import backports.weakref
-
-    weakref.finalize = backports.weakref.finalize
-# pylint: enable=unused-import,invalid-name
 
 
 def has_unittest_attr(item, attr):

saltfactories/utils/coverage/sitecustomize.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 try:
     import coverage
 

saltfactories/utils/event_listener.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.event_listener
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -20,7 +19,7 @@
 log = logging.getLogger(__name__)
 
 
-class EventListener(object):
+class EventListener:
     def __init__(self, timeout=60, auth_events_callback=None):
         self.store = deque(maxlen=10000)
         self.address = "tcp://127.0.0.1:{}".format(ports.get_unused_localhost_port())

saltfactories/utils/log_server.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     pytestsalt.fixtures.log_server_tornado
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/utils/markers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.utils.markers
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -93,14 +92,14 @@ def skip_if_no_local_network():
             pubsock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
             pubsock.bind(("", check_port))
         has_local_network = True
-    except socket.error:
+    except OSError:
         # I wonder if we just have IPV6 support?
         try:
             with contextlib.closing(socket.socket(socket.AF_INET6, socket.SOCK_STREAM)) as pubsock:
                 pubsock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
                 pubsock.bind(("", check_port))
             has_local_network = True
-        except socket.error:
+        except OSError:
             # Let's continue
             pass
     if has_local_network is False:
@@ -143,7 +142,7 @@ def skip_if_no_remote_network():
             # We connected? Stop the loop
             has_remote_network = True
             break
-        except socket.error:
+        except OSError:
             # Let's check the next IP
             continue
 

saltfactories/utils/platform.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.utils.platform
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/utils/ports.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.ports
 ~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -62,6 +61,6 @@ def get_connectable_ports(ports):
                     log.debug("Port %s is connectable!", port)
                     connectable_ports.add(port)
                     sock.shutdown(socket.SHUT_RDWR)
-            except socket.error:
+            except OSError:
                 continue
     return connectable_ports

saltfactories/utils/processes/__init__.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.processes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

saltfactories/utils/processes/bases.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
     saltfactories.utils.processes.bases
     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -14,6 +13,7 @@
 import sys
 import tempfile
 import time
+import weakref
 from collections import namedtuple
 from operator import itemgetter
 
@@ -28,7 +28,6 @@
     # import error, but its safe to pass
     pass
 
-from saltfactories.utils import compat
 from saltfactories.utils.processes.helpers import terminate_process
 from saltfactories.exceptions import ProcessTimeout
 
@@ -51,8 +50,8 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.__stdout = stdout
         self.__stderr = stderr
-        compat.weakref.finalize(self, stdout.close)
-        compat.weakref.finalize(self, stderr.close)
+        weakref.finalize(self, stdout.close)
+        weakref.finalize(self, stderr.close)
 
     def communicate(self, input=None):  # pylint: disable=arguments-differ
         super().communicate(input)
@@ -158,7 +157,7 @@ def __eq__(self, other):
         return self.stdout == other
 
 
-class FactoryProcess(object):
+class FactoryProcess:
     """
     Base class for subprocesses
     """
@@ -433,9 +432,9 @@ def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.python_executable = python_executable or sys.executable
         # We really do not want buffered output
-        self.environ.setdefault(str("PYTHONUNBUFFERED"), str("1"))
+        self.environ.setdefault("PYTHONUNBUFFERED", "1")
         # Don't write .pyc files or create them in __pycache__ directories
-        self.environ.setdefault(str("PYTHONDONTWRITEBYTECODE"), str("1"))
+        self.environ.setdefault("PYTHONDONTWRITEBYTECODE", "1")
 
     def build_cmdline(self, *args, **kwargs):
         cmdline = super().build_cmdline(*args, **kwargs)

saltfactories/utils/processes/helpers.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 saltfactories.utils.processes.helpers
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~