Merge branch 'pr/56'

fixed #55 printing to stdout with encoded output
CheetahTemplate3 · Jul 19, 2023 · 3335664 · 3335664
2 parents 6a511e7 + 8b0f39d
commit 3335664
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Cheetah/CheetahWrapper.py b/Cheetah/CheetahWrapper.py
@@ -592,7 +592,7 @@ def _compileOrFillStdin(self):
             pysrc = TemplateClass.compile(file=sys.stdin,
                                           compilerSettings=compilerSettings,
                                           returnAClass=False)
-            output = pysrc
+            output = pysrc if PY2 else pysrc.decode()
         else:
             output = str(TemplateClass(file=sys.stdin,
                                        compilerSettings=compilerSettings))

diff --git a/docs/authors.rst b/docs/authors.rst
@@ -41,4 +41,5 @@ Contributions have been made by:
 * odidev <odidev at puresoftware.com>
 * Pierre Ossman <ossman at cendio.se>
 * Michael Gorny <mgorny at gentoo.org>
+* nate.k <nate.k at onetrueloan.com>
 * Oleg Broytman <[email protected]>
diff --git a/docs/news.rst b/docs/news.rst
@@ -4,7 +4,13 @@ News
 Development (master)
 --------------------
 
-* CI(GHActions): Install all Python and PyPy versions from ``conda-forge``.
+Bug fixes:
+
+  - Fixed printing to stdout in ``CheetahWrapper``.
+
+CI:
+
+   - CI(GHActions): Install all Python and PyPy versions from ``conda-forge``.
 
 3.3.1 (2022-12-25)
 ------------------