Merge pull request #203 from scalative/mnt/modernize-code

MNT/modernize code

.github/workflows/test.yml

@@ -18,6 +18,9 @@ jobs:
       matrix:
         python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "3.12", "pypy3.9", "pypy3.10"]
         os: [windows-latest, ubuntu-latest, macos-latest]
+        exclude:
+          - python-version: "3.7"
+            os: macos-latest
       fail-fast: false
     runs-on: ${{ matrix.os }}  
     steps:

haas/__init__.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import logging
 
 __version__ = '0.10.0.dev1'

haas/error_holder.py

@@ -3,7 +3,7 @@
 # Copyright the CPython developers and contributors.
 
 
-class ErrorHolder(object):
+class ErrorHolder:
     """
     Placeholder for a TestCase inside a result. As far as a TestResult
     is concerned, this looks exactly like a unit test. Used to insert
@@ -21,15 +21,11 @@ def __init__(self, description):
     def id(self):
         return self.description
 
-    @property
-    def _testMethodName(self):
-        return self.description
-
     def shortDescription(self):
         return None
 
     def __repr__(self):
-        return "<ErrorHolder description=%r>" % (self.description,)
+        return f"<ErrorHolder description={self.description!r}>"
 
     def __str__(self):
         return self.id()
@@ -44,3 +40,7 @@ def __call__(self, result):
 
     def countTestCases(self):
         return 0
+
+    @property
+    def _testMethodName(self):
+        return self.description

haas/exceptions.py

@@ -4,7 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
 
 
 class HaasException(Exception):

haas/haas_application.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import argparse
 import os
 
@@ -64,7 +62,7 @@ def _add_log_level_option(parser):
                         help='Log level for haas logging')
 
 
-class HaasApplication(object):
+class HaasApplication:
     """Main haas application entry-point.
 
     """

haas/loader.py

@@ -4,14 +4,12 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import unittest
 
 from .suite import TestSuite
 
 
-class Loader(object):
+class Loader:
     """Load individual test cases from modules and wrap them in the
     :class:`~haas.suite.Suite` container.
 

haas/main.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals  # pragma: no cover
-
 import sys  # pragma: no cover
 
 from .haas_application import HaasApplication  # pragma: no cover

haas/module_import_error.py

@@ -4,10 +4,9 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
 
 
-class ModuleImportError(object):
+class ModuleImportError:
     """A base class for generated ModuleImportError placeholder test cases.
 
     """

haas/plugin_context.py

@@ -4,10 +4,9 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
 
 
-class PluginContext(object):
+class PluginContext:
     """Handles correct setup and teardown of multiple plugins.
 
     """

haas/plugin_manager.py

@@ -4,24 +4,17 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
-import sys
 import logging
+from collections import OrderedDict
 
 from stevedore.extension import ExtensionManager
 
 from .utils import uncamelcase
 
-if sys.version_info < (2, 7):  # pragma: no cover
-    from ordereddict import OrderedDict
-else:  # pragma: no cover
-    from collections import OrderedDict
-
 logger = logging.getLogger(__name__)
 
 
-class PluginManager(object):
+class PluginManager:
 
     ENVIRONMENT_HOOK = 'haas.hooks.environment'
 

haas/plugins/__init__.py

@@ -4,4 +4,3 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals

haas/plugins/base_hook_plugin.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 from .i_hook_plugin import IHookPlugin
 
 

haas/plugins/coverage.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import coverage
 
 from .base_hook_plugin import BaseHookPlugin

haas/plugins/discoverer.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 from fnmatch import fnmatch
 from importlib import import_module
 from os import getcwd
@@ -14,11 +12,11 @@
 import os
 import sys
 import traceback
+import unittest
 
 from haas.exceptions import DotInModuleNameError
 from haas.module_import_error import ModuleImportError
 from haas.suite import find_test_cases
-from haas.testing import unittest
 from .i_discoverer_plugin import IDiscovererPlugin
 
 logger = logging.getLogger(__name__)

haas/plugins/i_discoverer_plugin.py

@@ -4,14 +4,10 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
+from abc import ABC, abstractmethod, abstractclassmethod
 
-from abc import ABCMeta, abstractmethod
 
-from haas.utils import abstractclassmethod
-
-
-class IDiscovererPlugin(object, metaclass=ABCMeta):
+class IDiscovererPlugin(ABC):
 
     @abstractclassmethod
     def from_args(cls, args, arg_prefix, loader):

haas/plugins/i_hook_plugin.py

@@ -4,14 +4,10 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import abc
 
-from haas.utils import abstractclassmethod
-
 
-class IHookPlugin(object, metaclass=abc.ABCMeta):
+class IHookPlugin(abc.ABC):
 
     @abc.abstractmethod
     def setup(self):  # pragma: no cover
@@ -21,10 +17,10 @@ def setup(self):  # pragma: no cover
     def teardown(self):  # pragma: no cover
         pass
 
-    @abstractclassmethod
+    @abc.abstractclassmethod
     def add_parser_arguments(cls, parser, name, option_prefix, dest_prefix):
         pass
 
-    @abstractclassmethod
+    @abc.abstractclassmethod
     def from_args(cls, args, dest_prefix):
         pass

haas/plugins/i_result_handler_plugin.py

@@ -4,14 +4,10 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
+from abc import ABC, abstractmethod, abstractclassmethod
 
-from abc import ABCMeta, abstractmethod
 
-from haas.utils import abstractclassmethod
-
-
-class IResultHandlerPlugin(object, metaclass=ABCMeta):
+class IResultHandlerPlugin(ABC):
 
     @abstractclassmethod
     def from_args(cls, args, name, dest_prefix, test_count):

haas/plugins/i_runner_plugin.py

@@ -4,14 +4,10 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
+from abc import ABC, abstractclassmethod
 
-import abc
 
-from haas.utils import abstractclassmethod
-
-
-class IRunnerPlugin(object, metaclass=abc.ABCMeta):
+class IRunnerPlugin(ABC):
 
     @abstractclassmethod
     def from_args(cls, args, arg_prefix):

haas/plugins/parallel_runner.py

@@ -1,3 +1,9 @@
+# -*- coding: utf-8 -*-
+# Copyright (c) 2013-2014 Simon Jagoe
+# All rights reserved.
+#
+# This software may be modified and distributed under the terms
+# of the 3-clause BSD license.  See the LICENSE.txt file for details.
 from importlib import import_module
 from multiprocessing import Pool
 import time

haas/plugins/result_handler.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 import statistics
 import sys
 import time
@@ -22,7 +20,7 @@ def get_test_description(test, descriptions=True):
         return str(test)
 
 
-class _WritelnDecorator(object):
+class _WritelnDecorator:
     """Used to decorate file-like objects with a handy 'writeln' method"""
     def __init__(self, stream):
         self.stream = stream

haas/plugins/runner.py

@@ -4,8 +4,6 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
-
 from .i_runner_plugin import IRunnerPlugin
 import warnings
 

haas/plugins/tests/__init__.py

@@ -4,4 +4,3 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals

haas/plugins/tests/test_coverage.py

@@ -4,7 +4,8 @@
 #
 # This software may be modified and distributed under the terms
 # of the 3-clause BSD license.  See the LICENSE.txt file for details.
-from __future__ import absolute_import, unicode_literals
+from unittest import mock
+import unittest
 
 try:
     import coverage
@@ -14,10 +15,6 @@
     Coverage = None
 
 
-from haas.testing import unittest
-from haas.tests.compat import mock
-
-
 @unittest.skipIf(coverage is None, 'Coverage is not installed')
 class TestCoverage(unittest.TestCase):