[Python-checkins] python/dist/src/Lib/distutils/command upload.py, NONE, 1.1 bdist_dumb.py, 1.25, 1.26 bdist_rpm.py, 1.46, 1.47 bdist_wininst.py, 1.56, 1.57 sdist.py, 1.59, 1.60

[loewis at users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Lib/distutils/command
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6855/Lib/distutils/command

Modified Files:
	bdist_dumb.py bdist_rpm.py bdist_wininst.py sdist.py 
Added Files:
	upload.py 
Log Message:
Add the upload command. Make all dist commands register their
outputs with the distribution object.


--- NEW FILE: upload.py ---
"""distutils.command.upload

Implements the Distutils 'upload' subcommand (upload package to PyPI)."""


Index: bdist_dumb.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_dumb.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- bdist_dumb.py	10 Nov 2004 22:23:14 -0000	1.25
+++ bdist_dumb.py	21 Mar 2005 20:56:30 -0000	1.26
@@ -117,8 +117,9 @@
                                    ensure_relative(install.install_base))
 
         # Make the archive
-        self.make_archive(pseudoinstall_root,
-                          self.format, root_dir=archive_root)
+        filename = self.make_archive(pseudoinstall_root,
+                                     self.format, root_dir=archive_root)
+        self.distribution.dist_files.append(('bdist_dumb', filename))
 
         if not self.keep_temp:
             remove_tree(self.bdist_dir, dry_run=self.dry_run)

Index: bdist_rpm.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_rpm.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- bdist_rpm.py	10 Nov 2004 22:23:14 -0000	1.46
+++ bdist_rpm.py	21 Mar 2005 20:56:31 -0000	1.47
@@ -297,12 +297,14 @@
 
         # Make a source distribution and copy to SOURCES directory with
         # optional icon.
+        saved_dist_files = self.distributuion.dist_files[:]
         sdist = self.reinitialize_command('sdist')
         if self.use_bzip2:
             sdist.formats = ['bztar']
         else:
             sdist.formats = ['gztar']
         self.run_command('sdist')
+        self.distribution.dist_files = saved_dist_files
 
         source = sdist.get_archive_files()[0]
         source_dir = rpm_dir['SOURCES']
@@ -355,6 +357,7 @@
                 assert len(rpms) == 1, \
                        "unexpected number of RPM files found: %s" % rpms
                 self.move_file(rpms[0], self.dist_dir)
+                self.distribution.dist_files.append(('bdist_rpm', rpms[0]))
                 if debuginfo:
                     self.move_file(debuginfo[0], self.dist_dir)
     # run()

Index: bdist_wininst.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/bdist_wininst.py,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- bdist_wininst.py	10 Nov 2004 22:23:14 -0000	1.56
+++ bdist_wininst.py	21 Mar 2005 20:56:31 -0000	1.57
@@ -162,6 +162,8 @@
                                     root_dir=self.bdist_dir)
         # create an exe containing the zip-file
         self.create_exe(arcname, fullname, self.bitmap)
+        self.distribution.dist_files.append(('bdist_wininst', 
+                                             self.get_installer_filename()))
         # remove the zip-file again
         log.debug("removing temporary file '%s'", arcname)
         os.remove(arcname)

Index: sdist.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/command/sdist.py,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- sdist.py	10 Nov 2004 22:23:15 -0000	1.59
+++ sdist.py	21 Mar 2005 20:56:34 -0000	1.60
@@ -449,6 +449,7 @@
         for fmt in self.formats:
             file = self.make_archive(base_name, fmt, base_dir=base_dir)
             archive_files.append(file)
+            self.distribution.dist_files.append(('sdist',file))
 
         self.archive_files = archive_files