Merge remote-tracking branch 'ArrayBolt3/arraybolt3/trixie'

Author: adrelanos

run-tests

@@ -31,7 +31,7 @@ done
 stdin_file_read_utils=(stcat stcatn)
 stdin_implicit_read_utils=(sttee stsponge strip-markup unicode-show)
 stdin_utils=("${stdin_file_read_utils[@]}" "${stdin_implicit_read_utils[@]}")
-utils=(stprint stecho "${stdin_utils[@]}")
+utils=(stprint stecho sanitize-string "${stdin_utils[@]}")
 cd "${git_toplevel}/usr/bin"
 "${black[@]}" -- "${utils[@]}"
 "${pylint[@]}" -- "${utils[@]}"

unicode-testscript

@@ -58,23 +58,23 @@ process_file() {
   fi
 
   if cat -- "$file_name" | unicode-show >/dev/null ; then
-    ## unicode-show exit code non-zero.
+    ## unicode-show exit code 0.
     printf "%s\n" "$0: ERROR: Failed to find unicode using 'unicode-show' (stdin check) in file '$file_name'." >&2
     exit 1
   fi
-  ## unicode-show exit code 0.
+  ## unicode-show exit code non-zero.
 
   ## 'stcatn' should sanitize. Therefore 'unicode-show' should not find any unicode and exit 0.
   ## Check if there is a non-zero exit code in this pipe, because if so, that's a bug.
   if ! stcatn "$file_name" | unicode-show >/dev/null ; then
-    ## unicode-show exit code 0.
+    ## unicode-show exit code non-zero.
     printf "%s\n" "$0: ERROR: Failed to sanitize string using 'stcatn' in file '$file_name'." >&2
     exit 1
   fi
-  ## unicode-show non-zero exit code.
+  ## unicode-show exit code 0.
 
   if ! cat -- "$file_name" | sanitize-string nolimit >/dev/null ; then
-    ## unicode-show exit code 0.
+    ## sanitize-string exit code non-zero.
     printf "%s\n" "$0: ERROR: Failed to sanitize string using 'sanitize-string' (stdin check) in file '$file_name'." >&2
     exit 1
   fi
@@ -83,7 +83,7 @@ process_file() {
   file_content="$(cat -- "$file_name")"
 
   if ! sanitize-string nolimit "$file_content" >/dev/null ; then
-    ## unicode-show exit code 0.
+    ## sanitize-string exit code non-zero.
     printf "%s\n" "$0: ERROR: Failed to sanitize string using 'sanitize-string' (command check) in file '$file_name'." >&2
     exit 1
   fi
@@ -97,6 +97,7 @@ $0: ERROR: Folder '$HOME/trojan-source' missing. To get it:
 
 cd ~
 git clone git@github.com:nickboucher/trojan-source.git" >&2
+  exit 1
 fi
 
 ## Creates files:

usr/bin/grep-find-unicode-wrapper

@@ -16,7 +16,7 @@ check_grep_status() {
   elif [ "$1" = "1" ]; then
     true "$0: INFO: No match."
   else
-    printf '%s\n' "$0: ERROR: grep (syntax?) error! Exiting with code code '$1'." >&2
+    printf '%s\n' "$0: ERROR: grep (syntax?) error! Exiting with code '$1'." >&2
     exit "$1"
   fi
 }

usr/lib/python3/dist-packages/sanitize_string/sanitize_string.py

@@ -74,14 +74,19 @@ def main() -> int:
     ## Read untrusted_string from stdin if needed
     if untrusted_string is None:
         if sys.stdin is not None:
-            sys.stdin.reconfigure(errors="ignore")  # type: ignore
+            sys.stdin.reconfigure(  # type: ignore
+                encoding="utf-8", errors="replace", newline="\n"
+            )
             untrusted_string = sys.stdin.read()
         else:
             ## No way to get an untrusted string, print nothing and
             ## exit successfully
             return 0
 
     ## Sanitize and print
+    sys.stdout.reconfigure(  # type: ignore
+        encoding="ascii", errors="replace", newline="\n"
+    )
     assert untrusted_string is not None
     sanitized_string: str = sanitize_string(untrusted_string)
     if max_string_length is not None:

usr/lib/python3/dist-packages/unicode_show/tests/unicode_show.py

@@ -374,7 +374,7 @@ def test_clean_ascii(self) -> None:
 
         test_string: str = (
             " !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]"
-            + "^_`abcdefghjiklmnopqrstuvwxyz{|}~\n"
+            + "^_`abcdefghijklmnopqrstuvwxyz{|}~\n"
         )
         self._test_stdin(
             main_func=unicode_show_main,
@@ -476,16 +476,6 @@ def test_pty_color(self) -> None:
             stdin_string=test_string,
         )
 
-        os.environ["NO_COLOR"] = "0"
-        self._test_stdin_pty(
-            main_func=unicode_show_main,
-            argv0=self.argv0,
-            stdout_string=expect_string_color,
-            exit_code=1,
-            args=[],
-            stdin_string=test_string,
-        )
-
     def test_unicode_in_filename(self) -> None:
         """
         Tests if Unicode characters in filenames are properly sanitized.

usr/lib/python3/dist-packages/unicode_show/unicode_show.py

@@ -174,7 +174,7 @@ def main() -> int:
     global USE_COLOR
     USE_COLOR = (
         not os.getenv("NOCOLOR")
-        and os.getenv("NO_COLOR") != "1"
+        and not os.getenv("NO_COLOR")
         and os.getenv("TERM") != "dumb"
         and sys.stdout.isatty()
     )