Allow either README or README.txt as a "standard file".

diff --git a/Lib/distutils/command/dist.py b/Lib/distutils/command/dist.py
index 76332b2751317a7e37f0aebbe40f308897e622f6..ea61a4806e3f73fde09d719eaa696ecc5dc8a556 100644 (file)
--- a/Lib/distutils/command/dist.py
+++ b/Lib/distutils/command/dist.py
@@ -219,12 +219,24 @@ class Dist (Command):
 
     def find_defaults (self):
 
-        standards = ['README', 'setup.py']
+        standards = [('README', 'README.txt'), 'setup.py']
         for fn in standards:
-            if os.path.exists (fn):
-                self.files.append (fn)
+            if type (fn) is TupleType:
+                alts = fn
+                for fn in alts:
+                    if os.path.exists (fn):
+                        got_it = 1
+                        self.files.append (fn)
+                        break
+
+                if not got_it:
+                    self.warn ("standard file not found: should have one of " +
+                               string.join (alts, ', '))
             else:
-                self.warn ("standard file %s not found" % fn)
+                if os.path.exists (fn):
+                    self.files.append (fn)
+                else:
+                    self.warn ("standard file %s not found" % fn)
 
         optional = ['test/test*.py']
         for pattern in optional: