Merge branch 'pr/56' into next

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

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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 <phd@phdru.name>