[Scummvm-git-logs] scummvm master -> 82ba7e9830d97944b71e347e5ffe534caf0a76cb

[rvanlaar]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
82ba7e9830 DEVTOOL: COMPANION


Commit: 82ba7e9830d97944b71e347e5ffe534caf0a76cb
    https://github.com/scummvm/scummvm/commit/82ba7e9830d97944b71e347e5ffe534caf0a76cb
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-18T22:39:06+02:00

Commit Message:
DEVTOOL: COMPANION

Added support for Japanese encoding.

Remove option for specifying encodings. All input is expected to be
unicode.

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index aba3daf15e..74f1c91a24 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -75,9 +75,8 @@ def escape_string(s: str) -> str:
     return new_name
 
 
-def punyencode(orig: str, encoding: str = "mac_roman") -> str:
-    s = orig.encode("mac_roman").decode(encoding)
-    s = escape_string(s)
+def punyencode(orig: str) -> str:
+    s = escape_string(orig)
     encoded = s.encode("punycode").decode("ascii")
     # punyencoding adds an '-' at the end when there are no special chars
     # don't use it for comparing
@@ -231,13 +230,6 @@ def generate_parser() -> argparse.ArgumentParser:
     subparsers = parser.add_subparsers()
     parser_iso = subparsers.add_parser("iso", help="Dump hfs isos")
 
-    parser_iso.add_argument(
-        "-e",
-        metavar="ENCODING",
-        type=str,
-        default="mac_roman",
-        help="String encoding (see https://docs.python.org/3/library/codecs.html#standard-encodings)",
-    )
     parser_iso.add_argument("src", metavar="INPUT", type=Path, help="Disk image")
     parser_iso.add_argument(
         "dir", metavar="OUTPUT", type=Path, help="Destination folder"
@@ -302,9 +294,12 @@ def test_encode_stdin(capsys, monkeypatch):
 
 
 def test_decode_name():
-    checks = [["Icon\r", "xn--Icon-ja6e"]]
+    checks = [
+        ["Icon\r", "xn--Icon-ja6e"],
+        ["バッドデイ(Power PC)", "xn--(Power PC)-jx4ilmwb1a7h"],
+    ]
     for input, expected in checks:
-        assert punyencode(input, "mac_roman") == expected
+        assert punyencode(input) == expected
 
 
 def test_escape_string():