Fix encoding issue with README.rst/setup.py on Python 3 on Windows

benhoyt · Aug 22, 2017 · 29b6805 · 29b6805
1 parent 60f3c14
commit 29b6805
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/pybktree.py b/pybktree.py
@@ -14,7 +14,7 @@
 
 __all__ = ['hamming_distance', 'BKTree']
 
-__version__ = '1.0'
+__version__ = '1.1'
 
 _getitem0 = itemgetter(0)
 

diff --git a/setup.py b/setup.py
@@ -2,11 +2,19 @@
 
 import os
 import re
+import sys
 from distutils.core import setup
 
 
+# Read files as byte strings on Python 2.x, unicode strings on 3.x
+if sys.version_info < (3, 0):
+    open_args = {}
+else:
+    open_args = {'encoding': 'utf-8'}
+
+
 # Because it's best not to import the module in setup.py
-with open(os.path.join(os.path.dirname(__file__), 'pybktree.py')) as f:
+with open(os.path.join(os.path.dirname(__file__), 'pybktree.py'), **open_args) as f:
     for line in f:
         match = re.match(r"__version__.*'([0-9.]+)'", line)
         if match:
@@ -17,7 +25,7 @@
 
 
 # Read long_description from README.rst
-with open(os.path.join(os.path.dirname(__file__), 'README.rst')) as f:
+with open(os.path.join(os.path.dirname(__file__), 'README.rst'), **open_args) as f:
     long_description = f.read()