[Python-checkins] bpo-28167: bump platform.linux_distribution removal to 3.8 (GH-6669)

Tue May 15 11:17:03 EDT 2018

https://github.com/python/cpython/commit/9eb40bc38de83e6ad3fad1931bba1cd36ae88c24
commit: 9eb40bc38de83e6ad3fad1931bba1cd36ae88c24
branch: master
author: Matthias Bussonnier <bussonniermatthias at gmail.com>
committer: Petr Viktorin <encukou at gmail.com>
date: 2018年05月15日T11:17:00-04:00
summary:
bpo-28167: bump platform.linux_distribution removal to 3.8 (GH-6669)
Also bump PendingDeprecationWarning to DeprecationWarning.
files:
A Misc/NEWS.d/next/Library/2018-05-02-07-26-29.bpo-28167.7FwDfN.rst
M Doc/library/platform.rst
M Lib/platform.py
M Lib/test/test_platform.py

diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
index eea0abbae4d4..f5cb52cb4745 100644
--- a/Doc/library/platform.rst
+++ b/Doc/library/platform.rst
@@ -248,7 +248,8 @@ Unix Platforms
 
 This is another name for :func:`linux_distribution`.
 
- .. deprecated-removed:: 3.5 3.7
+ .. deprecated-removed:: 3.5 3.8
+ See alternative like the `distro <https://pypi.org/project/distro>`_ package.
 
 .. function:: linux_distribution(distname='', version='', id='', supported_dists=('SuSE','debian','redhat','mandrake',...), full_distribution_name=1)
 
@@ -266,7 +267,8 @@ Unix Platforms
 parameters. ``id`` is the item in parentheses after the version number. It
 is usually the version codename.
 
- .. deprecated-removed:: 3.5 3.7
+ .. deprecated-removed:: 3.5 3.8
+ See alternative like the `distro <https://pypi.org/project/distro>`_ package.
 
 .. function:: libc_ver(executable=sys.executable, lib='', version='', chunksize=2048)
 
diff --git a/Lib/platform.py b/Lib/platform.py
index dc981ec144cc..20f9817f4ffb 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -302,7 +302,7 @@ def linux_distribution(distname='', version='', id='',
 full_distribution_name=1):
 import warnings
 warnings.warn("dist() and linux_distribution() functions are deprecated "
- "in Python 3.5", PendingDeprecationWarning, stacklevel=2)
+ "in Python 3.5", DeprecationWarning, stacklevel=2)
 return _linux_distribution(distname, version, id, supported_dists,
 full_distribution_name)
 
@@ -376,7 +376,7 @@ def dist(distname='', version='', id='',
 """
 import warnings
 warnings.warn("dist() and linux_distribution() functions are deprecated "
- "in Python 3.5", PendingDeprecationWarning, stacklevel=2)
+ "in Python 3.5", DeprecationWarning, stacklevel=2)
 return _linux_distribution(distname, version, id,
 supported_dists=supported_dists,
 full_distribution_name=0)
@@ -1345,7 +1345,7 @@ def platform(aliased=0, terse=0):
 'ignore',
 r'dist\(\) and linux_distribution\(\) '
 'functions are deprecated .*',
- PendingDeprecationWarning,
+ DeprecationWarning,
 )
 distname, distversion, distid = dist('')
 if distname and not terse:
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 2cf4d3f5dfdb..5f1e28a5d950 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -353,14 +353,14 @@ def test_linux_distribution_encoding(self):
 class DeprecationTest(unittest.TestCase):
 
 def test_dist_deprecation(self):
- with self.assertWarns(PendingDeprecationWarning) as cm:
+ with self.assertWarns(DeprecationWarning) as cm:
 platform.dist()
 self.assertEqual(str(cm.warning),
 'dist() and linux_distribution() functions are '
 'deprecated in Python 3.5')
 
 def test_linux_distribution_deprecation(self):
- with self.assertWarns(PendingDeprecationWarning) as cm:
+ with self.assertWarns(DeprecationWarning) as cm:
 platform.linux_distribution()
 self.assertEqual(str(cm.warning),
 'dist() and linux_distribution() functions are '
diff --git a/Misc/NEWS.d/next/Library/2018-05-02-07-26-29.bpo-28167.7FwDfN.rst b/Misc/NEWS.d/next/Library/2018-05-02-07-26-29.bpo-28167.7FwDfN.rst
new file mode 100644
index 000000000000..a4971e5b77ba
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2018-05-02-07-26-29.bpo-28167.7FwDfN.rst
@@ -0,0 +1,3 @@
+The function ``platform.linux_ditribution`` and ``platform.dist`` now
+trigger a ``DeprecationWarning`` and have been marked for removal in Python
+3.8
