From 0dd281bb31e7baa8123eea52b45b7958b92f30ee Mon Sep 17 00:00:00 2001 From: LongHairedHacker Date: Tue, 15 Nov 2016 00:08:36 +0100 Subject: [PATCH] Decided to codecs instead of messing with manual decode/encode --- mixins/templatemixin.py | 7 ++++--- modules/sassassets.py | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/mixins/templatemixin.py b/mixins/templatemixin.py index f7e3805..cb8ad38 100644 --- a/mixins/templatemixin.py +++ b/mixins/templatemixin.py @@ -1,6 +1,7 @@ #!/usr/bin/env python2 import os +import codecs from dateutil import parser @@ -31,13 +32,13 @@ class TemplateMixin(object): print "Rendering %s" % out_path - out_file = open(out_path, "wb") - out_file.write(result.encode('utf-8')) + out_file = codecs.open(out_path, 'wb', 'utf-8') + out_file.write(result) out_file.close() def read_content_file(self, path): - content_file = open(path, 'r') + content_file = codecs.open(path, 'r', 'utf-8') result = {} diff --git a/modules/sassassets.py b/modules/sassassets.py index fcbc2c8..f224917 100644 --- a/modules/sassassets.py +++ b/modules/sassassets.py @@ -1,6 +1,7 @@ #!/usr/bin/env python2 import os +import codecs from pylibsass import sass from verdandi.mixins.messagemixin import MessageMixin @@ -34,14 +35,14 @@ class SassAssets(MessageMixin, RenderMixin, AssetsMixin): source_dir = os.path.dirname(source_path) original_dir = os.getcwd() - sass_file = open(source_path, 'r') - css_file = open(dest_path, 'w') + sass_file = codecs.open(source_path, 'r', 'utf-8') + css_file = codecs.open(dest_path, 'w', 'utf-8') os.chdir(source_dir) - sass_string = sass_file.read().decode('utf-8') + sass_string = sass_file.read() css_string = sass.compile_str(sass_string) - css_file.write(css_string.encode('utf-8')) + css_file.write(css_string) os.chdir(original_dir)