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 | d8e894fdcff0ec0a42dcbfb363d97fad49da119c (patch) | |
| tree | 475069532fcd2e4f9e0b9da4f59d7bf910915030 /setuptools/command | |
| parent | 9ed622878d3e82c07f4385ff47be135090bd1418 (diff) | |
| download | python-setuptools-bitbucket-d8e894fdcff0ec0a42dcbfb363d97fad49da119c.tar.gz | |
Merged the two lists of acceptable names of README.txt
Diffstat (limited to 'setuptools/command')
| -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) ) |
