Make stdisplay, strip_markup, unicode_show, sanitize_string library files non-executable, fix return value on unicode decode failure in unicode_show (suggested by Codex)

ArrayBolt3 · ArrayBolt3 · commit 3d12d9ba576d · 2025-12-07T10:06:16.000-06:00
diff --git a/usr/lib/python3/dist-packages/sanitize_string/py.typed b/usr/lib/python3/dist-packages/sanitize_string/py.typed
@@ -1 +0,0 @@
-#!/usr/bin/python3 -su
diff --git a/usr/lib/python3/dist-packages/sanitize_string/sanitize_string.py b/usr/lib/python3/dist-packages/sanitize_string/sanitize_string.py
@@ -89,7 +89,3 @@ def main() -> int:
     else:
         sys.stdout.write(sanitized_string)
     return 0
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/__init__.py b/usr/lib/python3/dist-packages/stdisplay/__init__.py
diff --git a/usr/lib/python3/dist-packages/stdisplay/py.typed b/usr/lib/python3/dist-packages/stdisplay/py.typed
@@ -1 +0,0 @@
-#!/usr/bin/python3 -su
diff --git a/usr/lib/python3/dist-packages/stdisplay/stcat.py b/usr/lib/python3/dist-packages/stdisplay/stcat.py
@@ -38,7 +38,3 @@ def main() -> None:
             )
             stdout.write(stdisplay(untrusted_text))
     stdout.flush()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/stcatn.py b/usr/lib/python3/dist-packages/stdisplay/stcatn.py
@@ -50,7 +50,3 @@ def main() -> None:
                 for untrusted_line in untrusted_file:
                     stdout.write(stdisplay(untrusted_line).rstrip() + "\n")
     stdout.flush()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/stdisplay.py b/usr/lib/python3/dist-packages/stdisplay/stdisplay.py
diff --git a/usr/lib/python3/dist-packages/stdisplay/stecho.py b/usr/lib/python3/dist-packages/stdisplay/stecho.py
@@ -20,7 +20,3 @@ def main() -> None:
         stdout.write(stdisplay(untrusted_text))
     stdout.write("\n")
     stdout.flush()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/stprint.py b/usr/lib/python3/dist-packages/stdisplay/stprint.py
@@ -19,7 +19,3 @@ def main() -> None:
         untrusted_text = "".join(argv[1:])
         stdout.write(stdisplay(untrusted_text))
         stdout.flush()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/stsponge.py b/usr/lib/python3/dist-packages/stdisplay/stsponge.py
@@ -32,7 +32,3 @@ def main() -> None:
                 file, "w", encoding="ascii", errors="replace", newline="\n"
             ) as out_file:
                 out_file.write(stdisplay("".join(untrusted_text_list)))
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/sttee.py b/usr/lib/python3/dist-packages/stdisplay/sttee.py
@@ -43,7 +43,3 @@ def main() -> None:
     finally:
         for output_file in output_files:
             output_file.close()
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stcat.py b/usr/lib/python3/dist-packages/stdisplay/tests/stcat.py
@@ -6,7 +6,6 @@
 
 # pylint: disable=missing-module-docstring
 
-import unittest
 import stdisplay.tests
 
 
@@ -66,7 +65,3 @@ def test_stcat_file(self) -> None:
             "a b\nc d",
             self._test_util(stdin="is ignored", argv=[self.tmpfiles["raw"]]),
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stcatn.py b/usr/lib/python3/dist-packages/stdisplay/tests/stcatn.py
@@ -6,7 +6,6 @@
 
 # pylint: disable=missing-module-docstring
 
-import unittest
 import stdisplay.tests
 
 
@@ -44,7 +43,3 @@ def test_stcatn_file(self) -> None:
             "a b\nc d\n",
             self._test_util(stdin="is ignored", argv=[self.tmpfiles["raw"]]),
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stdisplay.py b/usr/lib/python3/dist-packages/stdisplay/tests/stdisplay.py
@@ -339,7 +339,3 @@ def test_non_sgr_escape_sequences(self) -> None:
             ("\x1bP2$tight\x1b\\", "_P2$tight_\\"),
         ]
         self.run_stdisplay_cases(cases, sgr=2**24)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stecho.py b/usr/lib/python3/dist-packages/stdisplay/tests/stecho.py
@@ -6,7 +6,6 @@
 
 # pylint: disable=missing-module-docstring
 
-import unittest
 import stdisplay.tests
 
 
@@ -39,7 +38,3 @@ def test_stecho(self) -> None:
         ## \udcff == surrogate escape for 'ff' byte, this is what the string
         ## in sys.argv would contain if running `stecho $'a\xffb\n'`
         self.assertEqual("a_b\n\n", self._test_util(argv=["a\udcffb\n"]))
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stprint.py b/usr/lib/python3/dist-packages/stdisplay/tests/stprint.py
@@ -230,7 +230,3 @@ def test_stprint_environment_term_sgr(self) -> None:
             with self.subTest(text=text, expected_result=expected_result):
                 result = self.shell(text, term="xterm-direct")
                 self.assertEqual(result.stdout, expected_result)
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/stsponge.py b/usr/lib/python3/dist-packages/stdisplay/tests/stsponge.py
@@ -6,7 +6,6 @@
 
 # pylint: disable=missing-module-docstring disable=duplicate-code
 
-import unittest
 from pathlib import Path
 import stdisplay.tests
 
@@ -87,7 +86,3 @@ def test_stsponge(self) -> None:
             self.text_malicious_unicode_sanitized,
             Path(self.tmpfiles["fill"]).read_text(encoding="utf-8"),
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/stdisplay/tests/sttee.py b/usr/lib/python3/dist-packages/stdisplay/tests/sttee.py
@@ -6,7 +6,6 @@
 
 # pylint: disable=missing-module-docstring
 
-import unittest
 from pathlib import Path
 import stdisplay.tests
 
@@ -87,7 +86,3 @@ def test_sttee(self) -> None:
             self.text_malicious_unicode_sanitized,
             Path(self.tmpfiles["fill"]).read_text(encoding="utf-8"),
         )
-
-
-if __name__ == "__main__":
-    unittest.main()
diff --git a/usr/lib/python3/dist-packages/strip_markup/py.typed b/usr/lib/python3/dist-packages/strip_markup/py.typed
@@ -1 +0,0 @@
-#!/usr/bin/python3 -su
diff --git a/usr/lib/python3/dist-packages/strip_markup/strip_markup.py b/usr/lib/python3/dist-packages/strip_markup/strip_markup.py
@@ -68,7 +68,3 @@ def main() -> int:
     ## Sanitize and print
     sys.stdout.write(strip_markup(untrusted_string))
     return 0
-
-
-if __name__ == "__main__":
-    main()
diff --git a/usr/lib/python3/dist-packages/unicode_show/__init__.py b/usr/lib/python3/dist-packages/unicode_show/__init__.py
diff --git a/usr/lib/python3/dist-packages/unicode_show/py.typed b/usr/lib/python3/dist-packages/unicode_show/py.typed
@@ -1 +0,0 @@
-#!/usr/bin/python3 -su
diff --git a/usr/lib/python3/dist-packages/unicode_show/tests/unicode_show.py b/usr/lib/python3/dist-packages/unicode_show/tests/unicode_show.py
@@ -412,15 +412,15 @@ def test_invalid_utf8(self) -> None:
             stdout_string="",
             stderr_string=out_string.replace("FILENAME_PLACEHOLDER", "stdin"),
             args=[],
-            exit_code=1,
+            exit_code=2,
             stdin_string=test_string,
         )
         self._test_file(
             main_func=unicode_show_main,
             argv0=self.argv0,
             stdout_string="",
             stderr_string=out_string,
-            exit_code=1,
+            exit_code=2,
             file_contents=test_string,
         )
 
diff --git a/usr/lib/python3/dist-packages/unicode_show/unicode_show.py b/usr/lib/python3/dist-packages/unicode_show/unicode_show.py
@@ -180,6 +180,7 @@ def main() -> int:
     )
 
     clean: bool = True
+    had_valid_utf8: bool = True
     try:
         if len(sys.argv) > 1:
             for fname in sys.argv[1:]:
@@ -203,7 +204,7 @@ def main() -> int:
                         + f"{e}",
                         file=sys.stderr,
                     )
-                    clean = False
+                    had_valid_utf8 = False
                 except Exception as e:
                     print(
                         "[ERROR] File read error "
@@ -223,16 +224,15 @@ def main() -> int:
                     f"[ERROR] Unicode decode error [stdin]: {e}",
                     file=sys.stderr,
                 )
-                clean = False
+                had_valid_utf8 = False
     except Exception as e:
         print(f"[ERROR] Unexpected error [main]: {e}", file=sys.stderr)
         return 2
 
+    if not had_valid_utf8:
+        return 2
+
     if not clean:
         return 1
 
     return 0
-
-
-if __name__ == "__main__":
-    main()

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,3 @@ def main() -> None:`
`38`	`38`	`)`
`39`	`39`	`stdout.write(stdisplay(untrusted_text))`
`40`	`40`	`stdout.flush()`
`41`		`-`
`42`		`-`
`43`		`-if __name__ == "__main__":`
`44`		`- main()`