diff options
author | Lennart Regebro <regebro@gmail.com> | 2012-08-22 14:25:48 +0200 |
---|---|---|
committer | Lennart Regebro <regebro@gmail.com> | 2012-08-22 14:25:48 +0200 |
commit | cafaa3bd07185df0c17a19edee8820494d34267c (patch) | |
tree | bbb96cf4340e4e02ff1f2c4ebaf2a9ad2601ae3c /setuptools/command/sdist.py | |
parent | a3b6b2bba70b44b62865e6474e5a007400d62884 (diff) | |
download | external_python_setuptools-cafaa3bd07185df0c17a19edee8820494d34267c.tar.gz external_python_setuptools-cafaa3bd07185df0c17a19edee8820494d34267c.tar.bz2 external_python_setuptools-cafaa3bd07185df0c17a19edee8820494d34267c.zip |
Merged the two lists of acceptable names of README.txt
--HG--
branch : distribute
extra : rebase_source : 604b23f6559c4688d1b43bc102601e0a0ed914a9
Diffstat (limited to 'setuptools/command/sdist.py')
-rwxr-xr-x | setuptools/command/sdist.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/setuptools/command/sdist.py b/setuptools/command/sdist.py index edb3b7f3..16d3c37b 100755 --- a/setuptools/command/sdist.py +++ b/setuptools/command/sdist.py @@ -4,6 +4,8 @@ from distutils import log import os, re, sys, pkg_resources from glob import glob +READMES = ('README', 'README.rst', 'README.txt') + entities = [ ("<","<"), (">", ">"), (""", '"'), ("'", "'"), ("&", "&") @@ -155,7 +157,7 @@ class sdist(_sdist): dist_files.append(data) def add_defaults(self): - standards = [('README', 'README.rst', 'README.txt'), + standards = [READMES, self.distribution.script_name] for fn in standards: if isinstance(fn, tuple): @@ -220,13 +222,12 @@ class sdist(_sdist): read_template = __read_template_hack def check_readme(self): - alts = ("README", "README.txt") - for f in alts: + for f in READMES: if os.path.exists(f): return else: self.warn( - "standard file not found: should have one of " +', '.join(alts) + "standard file not found: should have one of " +', '.join(READMES) ) |