From 4e11f3268eea3f883bfcc8494972570f95489c3f Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sun, 15 Jun 2014 12:43:43 -0400 Subject: Use iterables to determine the best filename to use for changes. --- setup.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 54a86e8b..1c2e0234 100755 --- a/setup.py +++ b/setup.py @@ -90,12 +90,12 @@ class test(_test): readme_file = io.open('README.txt', encoding='utf-8') -# the release script adds hyperlinks to issues -if os.path.exists('CHANGES (links).txt'): - changes_file = io.open('CHANGES (links).txt', encoding='utf-8') -else: - # but if the release script has not run, fall back to the source file - changes_file = io.open('CHANGES.txt', encoding='utf-8') +# The release script adds hyperlinks to issues, +# but if the release script has not run, fall back to the source file +changes_names = 'CHANGES (links).txt', 'CHANGES.txt' +changes_fn = next(filter(os.path.exists, changes_names)) +changes_file = io.open(changes_fn, encoding='utf-8') + with readme_file: with changes_file: long_description = readme_file.read() + '\n' + changes_file.read() -- cgit v1.2.1