Merge remote-tracking branch 'origin/main' into dev/4.x.x

CycloneDX · Oct 20, 2023 · 257df0a · 257df0a
2 parents a79463e + 46cd517
commit 257df0a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 <!--next-version-placeholder-->
 
+## v3.11.5 (2023-10-20)
+
+### Fix
+
+* Custom input encoding ([#601](https://github.com/CycloneDX/cyclonedx-python/issues/601)) ([`363934c`](https://github.com/CycloneDX/cyclonedx-python/commit/363934c0bc69ebbb23472f1173bf3c6b1e3c023a))
+
 ## v3.11.4 (2023-10-19)
 
 ### Fix

diff --git a/cyclonedx_py/client.py b/cyclonedx_py/client.py
@@ -199,7 +199,8 @@ def get_arg_parser(*, prog: Optional[str] = None) -> argparse.ArgumentParser:
         )
         input_method_group.add_argument(
             '-i', '--in-file', action='store', metavar='FILE_PATH',
-            type=argparse.FileType('r'),  # FileType does handle '-'
+            # custom input shall be treated as binary, the actual encoding is detected later
+            type=argparse.FileType('rb'),  # FileType does handle '-'
             default=None,
             help='File to read input from. Use "-" to read from STDIN.', dest='input_source', required=False
         )