Remove deprecated StringHandle string value input/output

Author: ktbarrett

cocotb/handle.py

@@ -30,7 +30,6 @@
 # -*- coding: utf-8 -*-
 
 import enum
-import warnings
 from functools import lru_cache
 from typing import Optional
 
@@ -491,14 +490,6 @@ def value(self):
         """The value of this simulation object."""
         return self._value
 
-    def __str__(self):
-        if isinstance(self.value, bytes):
-            StringObject._emit_str_warning(self)
-            return self.value.decode("ascii")
-        else:
-            ModifiableObject._emit_str_warning(self)
-            return str(self.value)
-
 
 class NonHierarchyIndexableObject(NonHierarchyObject):
     """A non-hierarchy indexable object.
@@ -770,20 +761,6 @@ def value(self) -> BinaryValue:
     def __int__(self):
         return int(self.value)
 
-    def _emit_str_warning(self):
-        warnings.warn(
-            "`str({t})` is deprecated, and in future will return `{t}._path`. "
-            "To get a string representation of the value, use `str({t}.value)`.".format(
-                t=type(self).__qualname__
-            ),
-            FutureWarning,
-            stacklevel=3,
-        )
-
-    def __str__(self):
-        self._emit_str_warning()
-        return str(self.value)
-
 
 class RealObject(ModifiableObject):
     """Specific object handle for Real signals and variables."""
@@ -928,21 +905,10 @@ def _set_value(self, value, call_sim):
         .. versionchanged:: 1.4
             Takes :class:`bytes` instead of :class:`str`.
             Users are now expected to choose an encoding when using these objects.
-            As a convenience, when assigning :class:`str` values, ASCII encoding will be used as a safe default.
 
         """
         value, set_action = self._check_for_set_action(value)
 
-        if isinstance(value, str):
-            warnings.warn(
-                "Handles on string objects will soon not accept `str` objects. "
-                "Please use a bytes object by encoding the string as you see fit. "
-                "`str.encode('ascii')` is typically sufficient.",
-                DeprecationWarning,
-                stacklevel=2,
-            )
-            value = value.encode("ascii")  # may throw UnicodeEncodeError
-
         if not isinstance(value, bytes):
             raise TypeError(
                 "Unsupported type for string value assignment: {} ({!r})".format(
@@ -956,20 +922,6 @@ def _set_value(self, value, call_sim):
     def value(self) -> bytes:
         return self._handle.get_signal_val_str()
 
-    def _emit_str_warning(self):
-        warnings.warn(
-            "`str({t})` is deprecated, and in future will return `{t}._path`. "
-            "To access the `bytes` value of this handle, use `{t}.value`.".format(
-                t=type(self).__qualname__
-            ),
-            FutureWarning,
-            stacklevel=3,
-        )
-
-    def __str__(self):
-        self._emit_str_warning()
-        return self.value.decode("ascii")
-
 
 _handle2obj = {}
 

tests/test_cases/test_cocotb/test_deprecated.py

@@ -1,40 +1,3 @@
 # Copyright cocotb contributors
 # Licensed under the Revised BSD License, see LICENSE for details.
 # SPDX-License-Identifier: BSD-3-Clause
-import pytest
-
-import cocotb
-
-
-# strings are not supported on Icarus (gh-2585) or GHDL (gh-2584)
-@cocotb.test(
-    expect_error=AttributeError
-    if cocotb.SIM_NAME.lower().startswith("icarus")
-    else TypeError
-    if cocotb.SIM_NAME.lower().startswith("ghdl")
-    else ()
-)
-async def test_unicode_handle_assignment_deprecated(dut):
-    with pytest.warns(DeprecationWarning, match=".*bytes.*"):
-        dut.stream_in_string.value = "Bad idea"
-        await cocotb.triggers.ReadWrite()
-
-
-@cocotb.test()
-async def test_convert_handle_to_string_deprecated(dut):
-    dut.stream_in_data.value = 0
-    await cocotb.triggers.Timer(1, units="ns")
-
-    with pytest.warns(FutureWarning, match=".*_path.*"):
-        as_str = str(dut.stream_in_data)
-
-    # in future this will be ` == dut._path`
-    assert as_str == str(dut.stream_in_data.value)
-
-    if cocotb.LANGUAGE == "verilog":
-        # the `NUM_OF_MODULES` parameter is only present in the verilog design
-        with pytest.warns(FutureWarning, match=".*_path.*"):
-            as_str = str(dut.NUM_OF_MODULES)
-
-        # in future this will be ` == dut._path`
-        assert as_str == str(dut.NUM_OF_MODULES.value)