Merge branch 'master' into devel

This commit is contained in:
Max Zwiessele 2015-09-10 15:34:32 +01:00
commit e5d5d14aca

View file

@ -14,7 +14,8 @@ def read_to_rst(fname):
try:
import pypandoc
#print 'Warning in installation: For rst formatting in pypi, consider installing pypandoc for conversion'
return pypandoc.convert('README.md', 'rst')
with open('README.rst', 'w') as f:
f.write(pypandoc.convert('README.md', 'rst'))
except:
return read(fname)