mirror of
https://github.com/python/cpython.git
synced 2024-11-27 11:55:13 +08:00
Issue #26041: Remove "will be removed in Python 3.7" from description messages
We will keep platform.dist() and platform.linux_distribution() to make porting from Python 2 easier. Patch by Kumaripaba Miyurusara Athukorala.
This commit is contained in:
parent
2ec1bee1b3
commit
8d8221f0d6
@ -2271,9 +2271,8 @@ class has been deprecated.
|
||||
(Contributed by Serhiy Storchaka in :issue:`23671`.)
|
||||
|
||||
The :func:`platform.dist` and :func:`platform.linux_distribution` functions
|
||||
are now deprecated and will be removed in Python 3.7. Linux distributions use
|
||||
too many different ways of describing themselves, so the functionality is
|
||||
left to a package.
|
||||
are now deprecated. Linux distributions use too many different ways of
|
||||
describing themselves, so the functionality is left to a package.
|
||||
(Contributed by Vajrasky Kok and Berker Peksag in :issue:`1322`.)
|
||||
|
||||
The previously undocumented ``from_function`` and ``from_builtin`` methods of
|
||||
|
@ -303,8 +303,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 and will be removed in Python 3.7",
|
||||
PendingDeprecationWarning, stacklevel=2)
|
||||
"in Python 3.5", PendingDeprecationWarning, stacklevel=2)
|
||||
return _linux_distribution(distname, version, id, supported_dists,
|
||||
full_distribution_name)
|
||||
|
||||
@ -378,8 +377,7 @@ def dist(distname='', version='', id='',
|
||||
"""
|
||||
import warnings
|
||||
warnings.warn("dist() and linux_distribution() functions are deprecated "
|
||||
"in Python 3.5 and will be removed in Python 3.7",
|
||||
PendingDeprecationWarning, stacklevel=2)
|
||||
"in Python 3.5", PendingDeprecationWarning, stacklevel=2)
|
||||
return _linux_distribution(distname, version, id,
|
||||
supported_dists=supported_dists,
|
||||
full_distribution_name=0)
|
||||
|
@ -333,16 +333,14 @@ class DeprecationTest(unittest.TestCase):
|
||||
platform.dist()
|
||||
self.assertEqual(str(cm.warning),
|
||||
'dist() and linux_distribution() functions are '
|
||||
'deprecated in Python 3.5 and will be removed in '
|
||||
'Python 3.7')
|
||||
'deprecated in Python 3.5')
|
||||
|
||||
def test_linux_distribution_deprecation(self):
|
||||
with self.assertWarns(PendingDeprecationWarning) as cm:
|
||||
platform.linux_distribution()
|
||||
self.assertEqual(str(cm.warning),
|
||||
'dist() and linux_distribution() functions are '
|
||||
'deprecated in Python 3.5 and will be removed in '
|
||||
'Python 3.7')
|
||||
'deprecated in Python 3.5')
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
@ -107,6 +107,10 @@ Core and Builtins
|
||||
Library
|
||||
-------
|
||||
|
||||
- Issue #26041: Remove "will be removed in Python 3.7" from deprecation
|
||||
messages of platform.dist() and platform.linux_distribution().
|
||||
Patch by Kumaripaba Miyurusara Athukorala.
|
||||
|
||||
- Issue #26822: itemgetter, attrgetter and methodcaller objects no longer
|
||||
silently ignore keyword arguments.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user