Revert "don't attempt to UTF-8-decode binary values (#98)" (#99)

This reverts commit 15519e2.

Author: rolandwalker

CHANGELOG

@@ -1,5 +1,11 @@
 # Changelog
 
+## Version 2.8.2
+
+(released on 2026-01-26)
+
+- Revert: don't attempt to UTF-8-decode binary values.
+
 ## Version 2.8.1
 
 (released on 2026-01-24)

cli_helpers/utils.py

@@ -21,7 +21,16 @@ def bytes_to_string(b):
 
     """
     if isinstance(b, binary_type):
-        return "0x" + binascii.hexlify(b).decode("ascii")
+        needs_hex = False
+        try:
+            result = b.decode("utf8")
+            needs_hex = not result.isprintable()
+        except UnicodeDecodeError:
+            needs_hex = True
+        if needs_hex:
+            return "0x" + binascii.hexlify(b).decode("ascii")
+        else:
+            return result
     return b
 
 

tests/tabular_output/test_preprocessors.py

@@ -84,7 +84,7 @@ def test_bytes_to_string():
     """Test the bytes_to_string() function."""
     data = [[1, "John"], [2, b"Jill"]]
     headers = [0, "name"]
-    expected = ([[1, "John"], [2, "0x4a696c6c"]], [0, "name"])
+    expected = ([[1, "John"], [2, "Jill"]], [0, "name"])
     results = bytes_to_string(data, headers)
 
     assert expected == (list(results[0]), results[1])

tests/test_utils.py

@@ -13,7 +13,7 @@ def test_bytes_to_string_hexlify():
 
 def test_bytes_to_string_decode_bytes():
     """Test that bytes_to_string() decodes bytes."""
-    assert utils.bytes_to_string(b"foobar") == "0x666f6f626172"
+    assert utils.bytes_to_string(b"foobar") == "foobar"
 
 
 def test_bytes_to_string_unprintable():
@@ -31,7 +31,7 @@ def test_bytes_to_string_non_bytes():
 
 def test_to_string_bytes():
     """Test that to_string() converts bytes to a string."""
-    assert utils.to_string(b"foo") == "0x666f6f"
+    assert utils.to_string(b"foo") == "foo"
 
 
 def test_to_string_non_bytes():