Read setup.cfg into unicode object

pyscaffold · Feb 26, 2015 · 351923a · 351923a
1 parent 8f7ef2c
commit 351923a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/pyscaffold/data/setup_py.template b/pyscaffold/data/setup_py.template
@@ -154,7 +154,12 @@ def get_install_requirements(path):
 
 
 def read(fname):
-    return open(os.path.join(__location__, fname)).read()
+    with open(os.path.join(__location__, fname)) as fh:
+        content = fh.read()
+    # StringIO seems to expect a unicode object under Windows 7
+    if sys.version_info[0] < 3:
+        content = content.decode(encoding='utf8')
+    return content
 
 
 def str2bool(val):

diff --git a/setup.py b/setup.py
@@ -154,7 +154,12 @@ def get_install_requirements(path):
 
 
 def read(fname):
-    return open(os.path.join(__location__, fname)).read()
+    with open(os.path.join(__location__, fname)) as fh:
+        content = fh.read()
+    # StringIO seems to expect a unicode object under Windows 7
+    if sys.version_info[0] < 3:
+        content = content.decode(encoding='utf8')
+    return content
 
 
 def str2bool(val):