revert cli.py

just change context.py
lidayan · Sep 4, 2016 · 5be1003 · 5be1003
1 parent ffdde22
commit 5be1003
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/j2cli/cli.py b/j2cli/cli.py
@@ -1,4 +1,4 @@
-import os, sys, codecs
+import os, sys
 import argparse
 
 import jinja2
@@ -98,7 +98,7 @@ def render_command(cwd, environ, stdin, argv):
     if args.data == '-' and args.format == 'env':
         input_data_f = None
     else:
-        input_data_f = stdin if args.data == '-' else codecs.open(args.data, encoding='utf-8')
+        input_data_f = stdin if args.data == '-' else open(args.data)
 
     # Read data
     context = read_context_data(

diff --git a/j2cli/context.py b/j2cli/context.py
@@ -112,8 +112,16 @@ def _parse_env(data_string):
                     one.strip()
                     for one in line.split('=',1)
                 ]
-                for line in data_string.split("\n"))
+                for line in data_string.split("\n")
+            )
         )
+        data=dict(data)
+        for k,v in data.items():
+            try:
+                data[k] = v.decode('utf-8')
+            except:
+                pass
+
     else:
         data = data_string
         if isinstance(data, os._Environ):