bpo-28167: bump platform.linux_distribution removal to 3.8 (GH-6669)

Also bump PendingDeprecationWarning to DeprecationWarning.
This commit is contained in:
Matthias Bussonnier 2018-05-15 08:17:00 -07:00 committed by Petr Viktorin
parent 01abc6ec3a
commit 9eb40bc38d
4 changed files with 12 additions and 7 deletions

View file

@ -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: