remove six usage (pyocd#1812)

DavidLesnjak · a-detiste · web-flow · commit 5a1ada962e42 · 2025-09-17T07:02:36.000+02:00
Co-authored-by: Alexandre Detiste &lt;alexandre.detiste@gmail.com&gt;
diff --git a/.pylintrc b/.pylintrc
@@ -319,7 +319,7 @@ init-import=no
 
 # List of qualified module names which can have objects that can redefine
 # builtins.
-redefining-builtins-modules=six.moves,past.builtins,future.builtins,builtins,io
+redefining-builtins-modules=builtins,io
 
 
 [FORMAT]
diff --git a/pyocd/commands/execution_context.py b/pyocd/commands/execution_context.py
@@ -21,7 +21,6 @@
 import sys
 from typing import (Any, Callable, cast, Dict, IO, Iterator, List, NamedTuple, Optional, Sequence,
         TYPE_CHECKING)
-import six
 import pprint
 import subprocess
 from shutil import get_terminal_size
@@ -30,6 +29,7 @@
 from ..coresight.ap import MEM_AP
 from ..utility.strings import UniquePrefixMatcher
 from ..utility.cmdline import split_command_line
+from ..utility.compatibility import to_str_safe
 
 if TYPE_CHECKING:
     from ..debug.svd.model import SVDPeripheral
@@ -493,6 +493,6 @@ def handle_system(self, invocation: CommandInvocation) -> None:
         """@brief Evaluate a system call command."""
         try:
             output = subprocess.check_output(invocation.cmd, stderr=subprocess.STDOUT, shell=True)
-            self.write(six.ensure_str(output), end='')
+            self.write(to_str_safe(output), end='')
         except subprocess.CalledProcessError as err:
             raise exceptions.CommandError(str(err)) from err
diff --git a/pyocd/probe/jlink_probe.py b/pyocd/probe/jlink_probe.py
@@ -16,7 +16,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import six
 import logging
 from time import sleep
 import pylink
@@ -30,6 +29,7 @@
 from ..core.plugin import Plugin
 from ..core.options import OptionInfo
 from ..utility import conversion
+from ..utility.compatibility import to_str_safe
 
 if TYPE_CHECKING:
     from pylink.structs import JLinkHardwareStatus
@@ -128,7 +128,7 @@ def __init__(self, serial_number):
         self._protocol = None
         self._default_protocol = None
         self._is_open = False
-        self._product_name = six.ensure_str(info.acProduct)
+        self._product_name = to_str_safe(info.acProduct)
         self._memory_interfaces = {}
 
     @property
diff --git a/pyocd/probe/pydapaccess/interface/hidapi_backend.py b/pyocd/probe/pydapaccess/interface/hidapi_backend.py
@@ -18,7 +18,6 @@
 
 import logging
 import platform
-import six
 import threading
 import queue
 from typing import Optional
@@ -70,7 +69,7 @@ def __init__(self, dev, info: dict):
         self.vendor_name = info['manufacturer_string'] or f"{self.vid:#06x}"
         self.product_name = info['product_string'] or f"{self.pid:#06x}"
         self.serial_number = info['serial_number'] \
-                or generate_device_unique_id(self.vid, self.pid, six.ensure_str(info['path']))
+                or generate_device_unique_id(self.vid, self.pid, to_str_safe(info['path']))
         self.device_info = info
         self.device = dev
         self.closed = True
diff --git a/setup.cfg b/setup.cfg
@@ -67,7 +67,6 @@ install_requires =
     pylink-square>=1.0,<2.0
     pyusb>=1.2.1,<2.0
     pyyaml>=6.0,<7.0
-    six>=1.15.0,<2.0
     typing-extensions>=4.0,<5.0
 
 [options.extras_require]
diff --git a/test/basic_test.py b/test/basic_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/blank_test.py b/test/blank_test.py
@@ -14,8 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import os
 import sys
 from time import sleep
diff --git a/test/commands_test.py b/test/commands_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import sys
 import traceback
diff --git a/test/concurrency_test.py b/test/concurrency_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/connect_test.py b/test/connect_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import os
 import sys
 import traceback
diff --git a/test/cortex_test.py b/test/cortex_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/debug_context_test.py b/test/debug_context_test.py
@@ -14,8 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/flash_loader_test.py b/test/flash_loader_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/flash_test.py b/test/flash_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse
 import os
 import sys
diff --git a/test/gdb_test.py b/test/gdb_test.py
@@ -14,7 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 
 # Note
 #  To run this script GNU Tools ARM Embedded must be installed,
diff --git a/test/gdb_test_script.py b/test/gdb_test_script.py
@@ -14,7 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 
 # Notes about this script
 # 1. This script runs inside arm-none-eabi-gdb-py
diff --git a/test/json_lists_test.py b/test/json_lists_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import argparse, os, sys
 from time import sleep, time
 from random import randrange
diff --git a/test/parallel_test.py b/test/parallel_test.py
@@ -13,8 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
-
 import threading
 import multiprocessing
 
diff --git a/test/probeserver_test.py b/test/probeserver_test.py
@@ -13,7 +13,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 
 # Note
 #  To run this script GNU Tools ARM Embedded must be installed,
diff --git a/test/speed_test.py b/test/speed_test.py
@@ -14,7 +14,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 
 import os
 import sys
diff --git a/test/test_util.py b/test/test_util.py
@@ -14,14 +14,12 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-from __future__ import print_function
 
 import logging
 import os
 import sys
 import traceback
 from xml.etree import ElementTree
-import six
 import subprocess
 import tempfile
 import threading
@@ -195,7 +193,7 @@ def __init__(self, iostream, level=logging.NOTSET):
     def emit(self, record):
         try:
             message = self.format(record)
-            self.stream.write(six.u(message + "\n"))
+            self.stream.write(message + "\n")
         except Exception:
             self.handleError(record)
 
@@ -244,10 +242,10 @@ def get_test_case(self):
 
     def filter_output(self, output):
         """@brief Hex-encode null byte and control characters."""
-        result = six.text_type()
+        result = str()
         for c in output:
             if (c not in ('\n', '\r', '\t')) and (0 <= ord(c) <= 31):
-                result += u"\\x{:02x}".format(ord(c))
+                result += "\\x{:02x}".format(ord(c))
             else:
                 result += c
         return result
diff --git a/test/unit/test_cmdline.py b/test/unit/test_cmdline.py
@@ -16,7 +16,7 @@
 # limitations under the License.
 
 import pytest
-import six
+from pyocd.utility.compatibility import to_bytes_safe
 
 from pyocd.utility.cmdline import (
     split_command_line,
@@ -89,7 +89,7 @@ def test_vc_str(self, vc, msk):
         assert convert_vector_catch(vc) == msk
 
     @pytest.mark.parametrize(("vc", "msk"),
-        [(six.b(x), y) for x,y in VECTOR_CATCH_CHAR_MAP.items()])
+        [(to_bytes_safe(x), y) for x, y in VECTOR_CATCH_CHAR_MAP.items()])
     def test_vc_b(self, vc, msk):
         assert convert_vector_catch(vc) == msk
 
diff --git a/test/unit/test_conversion.py b/test/unit/test_conversion.py
@@ -16,7 +16,6 @@
 # limitations under the License.
 
 import pytest
-import six
 
 from pyocd.utility.conversion import (
     byte_list_to_nbit_le_list,
@@ -245,7 +244,7 @@ def test_align_down(self, args, result):
 class TestGdbEscape(object):
     # Verify all chars that shouldn't be escaped pass through unmodified.
     @pytest.mark.parametrize("data",
-        [six.int2byte(x) for x in range(256) if (x not in ESCAPEES)])
+        [bytes((x,)) for x in range(256) if (x not in ESCAPEES)])
     def test_escape_passthrough(self, data):
         assert escape(data) == data
 
@@ -263,9 +262,9 @@ def test_escape_2(self):
 
     # Verify all chars that shouldn't be escaped pass through unmodified.
     @pytest.mark.parametrize("data",
-        [six.int2byte(x) for x in range(256) if (x not in ESCAPEES)])
+        [bytes((x,)) for x in range(256) if (x not in ESCAPEES)])
     def test_unescape_passthrough(self, data):
-        assert unescape(data) == [six.byte2int(data)]
+        assert unescape(data) == [data[0]]
 
     @pytest.mark.parametrize(("expected", "data"), [
             (0x23, b'}\x03'),
diff --git a/test/unit/test_notification.py b/test/unit/test_notification.py
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 import pytest
-import six
 from enum import Enum
 
 from pyocd.utility.notification import (Notification, Notifier)
diff --git a/test/unit/test_options_manager.py b/test/unit/test_options_manager.py
@@ -15,7 +15,6 @@
 # limitations under the License.
 
 import pytest
-import six
 
 from pyocd.core.options_manager import OptionsManager
 from pyocd.core.options import OPTIONS_INFO
diff --git a/test/unit/test_sdc600.py b/test/unit/test_sdc600.py
@@ -16,7 +16,6 @@
 # limitations under the License.
 
 import pytest
-import six
 from unittest import mock
 
 from .test_rom_table import (MockCoreSightComponent, MockCoreSight, MockCSSOC600Components)
diff --git a/test/unit/test_semihosting.py b/test/unit/test_semihosting.py
@@ -21,13 +21,13 @@
 import os
 import logging
 # import telnetlib
-import six
 
 from pyocd.core.helpers import ConnectHelper
 from pyocd.core.target import Target
 from pyocd.debug import semihost
 from pyocd.utility.server import StreamServer
 from pyocd.utility.timeout import Timeout
+from pyocd.utility.compatibility import to_bytes_safe
 
 @pytest.fixture(scope='module')
 def tgt(request):
@@ -128,7 +128,7 @@ def read(self, fd, ptr, length):
         d = self._in_data[fd][:length]
         self._in_data[fd] = self._in_data[fd][length:]
         assert self.agent
-        self.agent.context.write_memory_block8(ptr, bytearray(six.ensure_binary(d)))
+        self.agent.context.write_memory_block8(ptr, bytearray(to_bytes_safe(d)))
         return length - len(d)
 
     def readc(self):
@@ -170,7 +170,7 @@ def do_open(self, filename, mode):
         argsptr = self.setup_semihost_request(semihost.SemihostingRequests.SYS_OPEN)
 
         # Write filename
-        filename = bytearray(six.ensure_binary(filename) + b'\x00')
+        filename = bytearray(to_bytes_safe(filename) + b'\x00')
         self.ctx.write_memory_block8(argsptr + 12, filename)
 
         self.ctx.write32(argsptr, argsptr + 12) # null terminated filename
@@ -197,7 +197,7 @@ def do_write(self, fd, data):
         argsptr = self.setup_semihost_request(semihost.SemihostingRequests.SYS_WRITE)
 
         # Write data
-        data = six.ensure_binary(data)
+        data = to_bytes_safe(data)
         self.ctx.write_memory_block8(argsptr + 12, data)
 
         self.ctx.write32(argsptr, fd) # fd
@@ -388,15 +388,15 @@ def test_file_write_read(self, semihost_builder, delete_testfile, mode, writeDat
             assert result == 0
 
             result = semihost_builder.do_flen(fd)
-            assert result == len(six.ensure_binary(writeData))
+            assert result == len(to_bytes_safe(writeData))
 
         if pos != -1:
             result = semihost_builder.do_seek(fd, pos)
             assert result == 0
 
         result, data = semihost_builder.do_read(fd, readLen)
         assert result == readResult
-        assert data == six.ensure_binary(writeData[pos:pos + readLen])
+        assert data == to_bytes_safe(writeData[pos:pos + readLen])
 
         result = semihost_builder.do_close(fd)
         assert result == 0
@@ -676,7 +676,7 @@ class TestSemihostIOHandlerBase:
         ])
     def test_std_open(self, ctx, ramrgn, ioh, filename, mode, expectedFd):
         handler, agent = ioh
-        ctx.write_memory_block8(ramrgn.start, bytearray(six.ensure_binary(filename) + b'\x00'))
+        ctx.write_memory_block8(ramrgn.start, bytearray(to_bytes_safe(filename) + b'\x00'))
         assert handler._std_open(ramrgn.start, len(filename), mode) == (expectedFd, filename)
 
     @pytest.mark.parametrize(("op", "args"), [
diff --git a/test/unit/test_sequencer.py b/test/unit/test_sequencer.py
diff --git a/test/user_script_test.py b/test/user_script_test.py
