From 0e1816da44c9769c9e1637b0c82660f010e0755a Mon Sep 17 00:00:00 2001 From: mzwiessele Date: Wed, 7 Oct 2015 13:17:01 +0100 Subject: [PATCH] [unicode] error in setup --- setup.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 8b134c24..66d99e08 100644 --- a/setup.py +++ b/setup.py @@ -42,7 +42,13 @@ import numpy as np def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() + try: + with open(os.path.join(os.path.dirname(__file__), fname)) as f: + return unicode(f.read()) + except NameError: + #python 3 + with open(os.path.join(os.path.dirname(__file__), fname)) as f: + return (f.read()) def read_to_rst(fname): try: @@ -50,7 +56,7 @@ def read_to_rst(fname): #print 'Warning in installation: For rst formatting in pypi, consider installing pypandoc for conversion' with open('README.rst', 'w') as f: f.write(pypandoc.convert('README.md', 'rst')) - except: + except ImportError: return read(fname) version_dummy = {}