Add --output-encoding to mako-render

Fixes: #271
Change-Id: I88b46cfbdea9eda0b4c478dd97829bee8431ff58

3 files changed, 19 insertions, 3 deletions

diff --git a/doc/build/changelog.rst b/doc/build/changelog.rst
index 1b7c51b..bb592c9 100644
--- a/doc/build/changelog.rst
+++ b/doc/build/changelog.rst
@@ -6,6 +6,16 @@ Changelog
 ===
 
 .. changelog::
+    :version: 1.0.8
+
+    .. change::
+        :tags: feature
+        :tickets: 271
+
+     Added ``--output-encoding`` flag to the mako-render script.
+     Pull request courtesy lacsaP.
+
+.. changelog::
     :version: 1.0.7
     :released: Thu Jul 13 2017
 
diff --git a/mako/__init__.py b/mako/__init__.py
index 01c1739..a73ab1e 100644
--- a/mako/__init__.py
+++ b/mako/__init__.py
@@ -5,4 +5,4 @@
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
 
-__version__ = '1.0.7'
+__version__ = '1.0.8'
diff --git a/mako/cmd.py b/mako/cmd.py
index 8db1346..609b4c9 100755
--- a/mako/cmd.py
+++ b/mako/cmd.py
@@ -35,14 +35,20 @@ def cmdline(argv=None):
         "template is read from stdin, the value defaults to be "
         "the current directory, otherwise it defaults to be the "
         "parent directory of the file provided.")
+    parser.add_argument(
+        "--output-encoding", default=None,
+        help="force output encoding")
     parser.add_argument('input', nargs='?', default='-')
 
     options = parser.parse_args(argv)
+
+    output_encoding = options.output_encoding
+
     if options.input == '-':
         lookup_dirs = options.template_dir or ["."]
         lookup = TemplateLookup(lookup_dirs)
         try:
-            template = Template(sys.stdin.read(), lookup=lookup)
+            template = Template(sys.stdin.read(), lookup=lookup, output_encoding=output_encoding)
         except:
             _exit()
     else:
@@ -52,7 +58,7 @@ def cmdline(argv=None):
         lookup_dirs = options.template_dir or [dirname(filename)]
         lookup = TemplateLookup(lookup_dirs)
         try:
-            template = Template(filename=filename, lookup=lookup)
+            template = Template(filename=filename, lookup=lookup, output_encoding=output_encoding)
         except:
             _exit()