Merge remote-tracking branch 'amazingpp/gh-193'

* amazingpp/gh-193:
  Fix UnicodeEncodeError in `zkg create` with non-ASCII characters in user vars

CHANGES

@@ -1,3 +1,7 @@
+3.0.1-41 | 2024-09-10 10:36:13 +0200
+
+  * Fix UnicodeEncodeError in `zkg create` with non-ASCII characters in user vars (Fupeng Zhao)
+
 3.0.1-39 | 2024-07-18 18:48:44 +0200
 
   * Use documented Git package exception API (Benjamin Bannier, Corelight)

VERSION

@@ -1 +1 @@
-3.0.1-39
+3.0.1-41

doc/man/zkg.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "ZKG" "1" "May 13, 2024" "3.0.1-33" "Zeek Package Manager"
+.TH "ZKG" "1" "Sep 10, 2024" "3.0.1-41" "Zeek Package Manager"
 .SH NAME
 zkg \- Zeek Package Manager
 .sp

testing/baselines/tests.template-create/output

@@ -8,3 +8,4 @@
 <...>/out3 (installed: master) - TODO: A more detailed description of test3.
 error: could not determine value of user variable "name", provide via environment or --user-var
 error: the following features are unknown: "doesntexist". Template "foo" offers "readme".
+"foo" will use value of "name" (the name of the package, e.g. "FooBar") from command line: 你こ안مγПनสXש😊©GBCDČM

testing/tests/template-create

@@ -36,4 +36,8 @@
 # Request an unknown feature. This should fail.
 # @TEST-EXEC-FAIL: zkg create --packagedir out5 --template $TEMPLATES/foo --feature doesntexist >>output 2>&1
 
+# Provide non-ASCII characters variable via --user-var and ensure resulting package installs
+# @TEST-EXEC: zkg create --packagedir out6 --template $TEMPLATES/foo --user-var name=你こ안مγПनสXש😊©GBCDČM >>output
+# @TEST-EXEC: zkg install ./out6
+
 # @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff output

zeekpkg/__init__.py

@@ -9,7 +9,7 @@
 
 import logging
 
-__version__ = "3.0.1-39"
+__version__ = "3.0.1-41"
 __all__ = ["manager", "package", "source", "template", "uservar"]  # noqa: F405
 
 LOG = logging.getLogger(__name__)

zeekpkg/template.py

@@ -687,8 +687,8 @@ def _replace(self, tmpl, content):
         for name, val in tmpl.params().items():
             pat = "@" + name + "@"
             if not isinstance(content, str):
-                pat = bytes(pat, "ascii")
-                val = bytes(val, "ascii")
+                pat = bytes(pat, "utf-8")
+                val = bytes(val, "utf-8")
             content = re.sub(pat, val, content, flags=re.IGNORECASE)
 
         return content