[Scummvm-git-logs] scummvm master -> 61f7390b322a6c45b796001d453f28de8147a766

[rvanlaar]

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

Summary:
f5fa418864 DEVTOOLS: COMPANION: fix skipping first path
61f7390b32 JANITORIAL: DEVTOOLS: COMPANION: formatting


Commit: f5fa418864fca2f3fc988b090047f88944b7ad4a
    https://github.com/scummvm/scummvm/commit/f5fa418864fca2f3fc988b090047f88944b7ad4a
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-23T22:15:22+02:00

Commit Message:
DEVTOOLS: COMPANION: fix skipping first path

The new glob **/* does not include the root director. Skipping the first
element resulted in the first file being skipped.

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 862990850a..5cd379f470 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -326,7 +326,6 @@ def punyencode_dir(directory: Path, verbose: bool = False) -> int:
     files: List[Path] = []
     dirs: List[Path] = []
     path_glob = directory.glob("**/*")
-    next(path_glob)  # Don't punyencode the root directory
     for item in path_glob:
         if item.is_file():
             files.append(item)


Commit: 61f7390b322a6c45b796001d453f28de8147a766
    https://github.com/scummvm/scummvm/commit/61f7390b322a6c45b796001d453f28de8147a766
Author: Roland van Laar (roland at rolandvanlaar.nl)
Date: 2021-08-23T22:15:22+02:00

Commit Message:
JANITORIAL: DEVTOOLS: COMPANION: formatting

Changed paths:
    devtools/dumper-companion.py


diff --git a/devtools/dumper-companion.py b/devtools/dumper-companion.py
index 5cd379f470..1aaa4720bb 100755
--- a/devtools/dumper-companion.py
+++ b/devtools/dumper-companion.py
@@ -439,7 +439,9 @@ def generate_parser() -> argparse.ArgumentParser:
     parser_dir.add_argument("directory", metavar="directory ", type=Path, help="Path")
     parser_dir.set_defaults(func=punyencode_arg)
 
-    parser_str = subparsers.add_parser("str", help="Convert strings or standard in to or from punycode")
+    parser_str = subparsers.add_parser(
+        "str", help="Convert strings or standard in to or from punycode"
+    )
     parser_str.add_argument(
         "--stdin", action="store_true", help="Convert stdin to punycode"
     )
@@ -507,6 +509,7 @@ def test_encode_string(capsys):
         captured = capsys.readouterr()
         assert captured.out == input + "\n"
 
+
 def test_encode_stdin(capsys, monkeypatch):
     monkeypatch.setattr("sys.stdin", io.StringIO("Icon\r"))
     call_test_parser(["str", "--stdin"])