| commit | 68d468cf4f1b8f42a7766da6cfc7b50cb91e57c5 | [log] [tgz] |
|---|---|---|
| author | Timothy Crosley <timothy.crosley@gmail.com> | Sat Dec 07 09:41:42 2013 -0500 |
| committer | Timothy Crosley <timothy.crosley@gmail.com> | Sat Dec 07 09:41:42 2013 -0500 |
| tree | 9f71690c3fbf19b065c67ab85e5ed78c6f6825fd | |
| parent | 2d599243707f28c356b869af65a4ffe5c234cb8d [diff] | |
| parent | 32cf1959677c8abbaed14afeec553e0d44358377 [diff] |
Merge remote-tracking branch 'origin' into release/2.6.1
diff --git a/setup.py b/setup.py index 3490577..23b2720 100755 --- a/setup.py +++ b/setup.py
@@ -38,7 +38,7 @@ try: import pypandoc readme = pypandoc.convert('README.md', 'rst') -except (IOError, ImportError): +except (IOError, ImportError, OSError, RuntimeError): readme = '' setup(name='isort',