diff options
| author | Paul Ganssle <pganssle@users.noreply.github.com> | 2018-12-17 02:59:02 -0500 |
|---|---|---|
| committer | Petr Viktorin <encukou@gmail.com> | 2018-12-17 08:59:02 +0100 |
| commit | 4e80f5cbeaee87a26e49bc9623c92a10e28dbbd9 (patch) | |
| tree | 003fa84cce4c9acfae6ff9bd256c470f24a0dee2 | |
| parent | 2dfe3511fe310c559d5571c52dcac381f33fd3a6 (diff) | |
| download | cpython-git-4e80f5cbeaee87a26e49bc9623c92a10e28dbbd9.tar.gz | |
bpo-35186: Remove "built with" comment in setup.py upload (GH-10414)
platform.dist() is deprecated and slated for removal in Python 3.8. The
upload command itself should also not be used to upload to PyPI, but
while it continues to exist it should not use deprecated functions.
| -rw-r--r-- | Lib/distutils/command/upload.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS.d/next/Library/2018-11-08-14-22-29.bpo-35186.5m22Mj.rst | 2 |
2 files changed, 4 insertions, 8 deletions
diff --git a/Lib/distutils/command/upload.py b/Lib/distutils/command/upload.py index 32dda359ba..613ea71129 100644 --- a/Lib/distutils/command/upload.py +++ b/Lib/distutils/command/upload.py @@ -121,14 +121,8 @@ class upload(PyPIRCCommand): 'requires': meta.get_requires(), 'obsoletes': meta.get_obsoletes(), } - comment = '' - if command == 'bdist_rpm': - dist, version, id = platform.dist() - if dist: - comment = 'built for %s %s' % (dist, version) - elif command == 'bdist_dumb': - comment = 'built for %s' % platform.platform(terse=1) - data['comment'] = comment + + data['comment'] = '' if self.sign: data['gpg_signature'] = (os.path.basename(filename) + ".asc", diff --git a/Misc/NEWS.d/next/Library/2018-11-08-14-22-29.bpo-35186.5m22Mj.rst b/Misc/NEWS.d/next/Library/2018-11-08-14-22-29.bpo-35186.5m22Mj.rst new file mode 100644 index 0000000000..2e8cff9829 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2018-11-08-14-22-29.bpo-35186.5m22Mj.rst @@ -0,0 +1,2 @@ +Removed the "built with" comment added when ``setup.py upload`` is used with +either ``bdist_rpm`` or ``bdist_dumb``. |