modernize test cases

felixdivo · felixdivo · commit 5103e3592bf1 · 2019-05-18T19:00:41.000+02:00
diff --git a/test/back2back_test.py b/test/back2back_test.py
@@ -5,8 +5,6 @@
 This module tests two virtual buses attached to each other.
 """
 
-from __future__ import absolute_import, print_function
-
 import sys
 import unittest
 from time import sleep
diff --git a/test/listener_test.py b/test/listener_test.py
@@ -4,8 +4,6 @@
 """
 """
 
-from __future__ import absolute_import, print_function
-
 from time import sleep
 import unittest
 import random
@@ -117,7 +115,7 @@ def test_filetype_to_instance(extension, klass):
         test_filetype_to_instance(".log", can.CanutilsLogReader)
 
         # test file extensions that are not supported
-        with self.assertRaisesRegexp(NotImplementedError, ".xyz_42"):
+        with self.assertRaisesRegex(NotImplementedError, ".xyz_42"):
             test_filetype_to_instance(".xyz_42", can.Printer)
 
     def testLoggerTypeResolution(self):
diff --git a/test/logformats_test.py b/test/logformats_test.py
@@ -14,20 +14,12 @@
 TODO: implement CAN FD support testing
 """
 
-from __future__ import print_function, absolute_import, division
-
 import logging
 import unittest
 import tempfile
 import os
 from abc import abstractmethod, ABCMeta
-
-try:
-    # Python 3
-    from itertools import zip_longest
-except ImportError:
-    # Python 2
-    from itertools import izip_longest as zip_longest
+from itertools import zip_longest
 
 import can
 
@@ -39,7 +31,7 @@
 logging.basicConfig(level=logging.DEBUG)
 
 
-class ReaderWriterTest(unittest.TestCase, ComparingMessagesTestCase):
+class ReaderWriterTest(unittest.TestCase, ComparingMessagesTestCase, metaclass=ABCMeta):
     """Tests a pair of writer and reader by writing all data first and
     then reading all data and checking if they could be reconstructed
     correctly. Optionally writes some comments as well.
@@ -50,8 +42,6 @@ class ReaderWriterTest(unittest.TestCase, ComparingMessagesTestCase):
         (Source: `*Wojciech B.* on StackOverlfow <https://stackoverflow.com/a/22836015/3753684>`_)
     """
 
-    __metaclass__ = ABCMeta
-
     def __init__(self, *args, **kwargs):
         unittest.TestCase.__init__(self, *args, **kwargs)
         self._setup_instance()
diff --git a/test/message_helper.py b/test/message_helper.py
@@ -5,12 +5,10 @@
 This module contains a helper for writing test cases that need to compare messages.
 """
 
-from __future__ import absolute_import, print_function
-
 from copy import copy
 
 
-class ComparingMessagesTestCase(object):
+class ComparingMessagesTestCase:
     """
     Must be extended by a class also extending a unittest.TestCase.
 
diff --git a/test/network_test.py b/test/network_test.py
@@ -1,17 +1,13 @@
 #!/usr/bin/env python
 # coding: utf-8
 
-from __future__ import print_function
 
 import unittest
 import threading
-try:
-    import queue
-except ImportError:
-    import Queue as queue
+import queue
 import random
-
 import logging
+
 logging.getLogger(__file__).setLevel(logging.WARNING)
 
 # make a random bool:
diff --git a/test/notifier_test.py b/test/notifier_test.py
@@ -3,10 +3,7 @@
 
 import unittest
 import time
-try:
-    import asyncio
-except ImportError:
-    asyncio = None
+import asyncio
 
 import can
 
@@ -45,7 +42,6 @@ def test_multiple_bus(self):
 
 class AsyncNotifierTest(unittest.TestCase):
 
-    @unittest.skipIf(asyncio is None, 'Test requires asyncio')
     def test_asyncio_notifier(self):
         loop = asyncio.get_event_loop()
         bus = can.Bus('test', bustype='virtual', receive_own_messages=True)
@@ -60,6 +56,5 @@ def test_asyncio_notifier(self):
         bus.shutdown()
 
 
-
 if __name__ == '__main__':
     unittest.main()
diff --git a/test/serial_test.py b/test/serial_test.py
@@ -7,8 +7,6 @@
 Copyright: 2017 Boris Wenzlaff
 """
 
-from __future__ import division
-
 import unittest
 from mock import patch
 
@@ -18,7 +16,7 @@
 from .message_helper import ComparingMessagesTestCase
 
 
-class SerialDummy(object):
+class SerialDummy:
     """
     Dummy to mock the serial communication
     """
diff --git a/test/simplecyclic_test.py b/test/simplecyclic_test.py
@@ -5,8 +5,6 @@
 This module tests cyclic send tasks.
 """
 
-from __future__ import absolute_import
-
 from time import sleep
 import unittest
 import gc
diff --git a/test/test_detect_available_configs.py b/test/test_detect_available_configs.py
@@ -6,12 +6,8 @@
 :meth:`can.BusABC.detect_available_configs`.
 """
 
-from __future__ import absolute_import
-
 import sys
 import unittest
-if sys.version_info.major > 2:
-    basestring = str
 
 from can import detect_available_configs
 
@@ -33,7 +29,7 @@ def test_general_values(self):
         for config in configs:
             self.assertIn('interface', config)
             self.assertIn('channel', config)
-            self.assertIsInstance(config['interface'], basestring)
+            self.assertIsInstance(config['interface'], str)
 
     def test_content_virtual(self):
         configs = detect_available_configs(interfaces='virtual')
diff --git a/test/test_kvaser.py b/test/test_kvaser.py
@@ -8,10 +8,7 @@
 import time
 import logging
 import unittest
-try:
-    from unittest.mock import Mock, patch
-except ImportError:
-    from mock import patch, Mock
+from unittest.mock import Mock, patch
 
 import pytest
 
diff --git a/test/test_load_file_config.py b/test/test_load_file_config.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
+
 import shutil
 import tempfile
 import unittest
diff --git a/test/test_message_filtering.py b/test/test_message_filtering.py
@@ -5,8 +5,6 @@
 This module tests :meth:`can.BusABC._matches_filters`.
 """
 
-from __future__ import absolute_import
-
 import unittest
 
 from can import Bus, Message
diff --git a/test/test_message_sync.py b/test/test_message_sync.py
@@ -5,8 +5,6 @@
 This module tests :class:`can.MessageSync`.
 """
 
-from __future__ import absolute_import
-
 from copy import copy
 from time import time
 import gc
diff --git a/test/test_scripts.py b/test/test_scripts.py
@@ -5,8 +5,6 @@
 This module tests that the scripts are all callable.
 """
 
-from __future__ import absolute_import
-
 import subprocess
 import unittest
 import sys
@@ -16,9 +14,7 @@
 from .config import *
 
 
-class CanScriptTest(unittest.TestCase):
-
-    __metaclass__ = ABCMeta
+class CanScriptTest(unittest.TestCase, metaclass=ABCMeta):
 
     @classmethod
     def setUpClass(cls):
diff --git a/test/test_slcan.py b/test/test_slcan.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # coding: utf-8
+
 import unittest
 import can
 
diff --git a/test/test_socketcan.py b/test/test_socketcan.py
@@ -3,14 +3,9 @@
 """
 import unittest
 
-try:
-    from unittest.mock import Mock
-    from unittest.mock import patch
-    from unittest.mock import call
-except ImportError:
-    from mock import Mock
-    from mock import patch
-    from mock import call
+from unittest.mock import Mock
+from unittest.mock import patch
+from unittest.mock import call
 
 import ctypes
 
diff --git a/test/test_socketcan_helpers.py b/test/test_socketcan_helpers.py
@@ -5,8 +5,6 @@
 Tests helpers in `can.interfaces.socketcan.socketcan_common`.
 """
 
-from __future__ import absolute_import
-
 import unittest
 
 from can.interfaces.socketcan.utils import \
@@ -36,7 +34,7 @@ def test_find_available_interfaces(self):
         result = list(find_available_interfaces())
         self.assertGreaterEqual(len(result), 0)
         for entry in result:
-            self.assertRegexpMatches(entry, r"v?can\d+")
+            self.assertRegex(entry, r"v?can\d+")
         if TEST_INTERFACE_SOCKETCAN:
             self.assertGreaterEqual(len(result), 1)
             self.assertIn("vcan0", result)
diff --git a/test/test_systec.py b/test/test_systec.py
@@ -2,10 +2,7 @@
 # coding: utf-8
 
 import unittest
-try:
-    from unittest.mock import Mock, patch
-except ImportError:
-    from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 import can
 from can.interfaces.systec import ucan, ucanbus
diff --git a/test/test_viewer.py b/test/test_viewer.py
@@ -23,8 +23,6 @@
 # Web      :  http://www.lauszus.com
 # e-mail   :  lauszus@gmail.com
 
-from __future__ import absolute_import
-
 import argparse
 import can
 import curses
@@ -36,15 +34,8 @@
 import unittest
 import os
 import six
-
 from typing import Dict, Tuple, Union
-
-try:
-    # noinspection PyCompatibility
-    from unittest.mock import Mock, patch
-except ImportError:
-    # noinspection PyPackageRequirements
-    from mock import Mock, patch
+from unittest.mock import Mock, patch
 
 from can.viewer import KEY_ESC, KEY_SPACE, CanViewer, parse_args
 
@@ -337,9 +328,7 @@ def test_pack_unpack(self):
         parsed_data = CanViewer.unpack_data(CANOPEN_TPDO4 + 2, data_structs, raw_data)
         self.assertListEqual(parsed_data, [0xFFFFFF, 0xFFFFFFFF])
 
-        # See: http://python-future.org/compatible_idioms.html#long-integers
-        from past.builtins import long
-        self.assertTrue(all(isinstance(d, (int, long)) for d in parsed_data))
+        self.assertTrue(all(isinstance(d, int) for d in parsed_data))
 
         # Make sure that the ValueError exception is raised
         with self.assertRaises(ValueError):
