[Python-checkins] bpo-42163, bpo-42189, bpo-42659: Support uname_tuple._replace (for all but processor) (#23010)
jaraco
webhook-mailer at python.org
Thu Dec 31 14:08:12 EST 2020
https://github.com/python/cpython/commit/a6fd0f414c0cb4cd5cc20eb2df3340b31c6f7743
commit: a6fd0f414c0cb4cd5cc20eb2df3340b31c6f7743
branch: master
author: Jason R. Coombs <jaraco at jaraco.com>
committer: jaraco <jaraco at jaraco.com>
date: 2020-12-31T14:08:03-05:00
summary:
bpo-42163, bpo-42189, bpo-42659: Support uname_tuple._replace (for all but processor) (#23010)
* Add test capturing missed expectation with uname_result._replace.
* bpo-42163: Override uname_result._make to allow uname_result._replace to work (for everything but 'processor'.
* Replace hard-coded length with one derived from the definition.
* Add test capturing missed expectation with copy/deepcopy on namedtuple (bpo-42189).
* bpo-42189: Exclude processor parameter when constructing uname_result.
* In _make, rely on __new__ to strip processor.
* Add blurb.
* iter is not necessary here.
* Rely on num_fields in __new__
* Add test for slices on uname
* Add test for copy and pickle.
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
* import pickle
* Fix equality test after pickling.
* Simply rely on __reduce__ for pickling.
Co-authored-by: Serhiy Storchaka <storchaka at gmail.com>
files:
A Misc/NEWS.d/next/Library/2020-10-29-09-22-56.bpo-42163.O4VcCY.rst
M Lib/platform.py
M Lib/test/test_platform.py
diff --git a/Lib/platform.py b/Lib/platform.py
index 1a07b44077b88..985e12d9684ea 100755
--- a/Lib/platform.py
+++ b/Lib/platform.py
@@ -769,7 +769,7 @@ class uname_result(
):
"""
A uname_result that's largely compatible with a
- simple namedtuple except that 'platform' is
+ simple namedtuple except that 'processor' is
resolved late and cached to avoid calling "uname"
except when needed.
"""
@@ -784,12 +784,25 @@ def __iter__(self):
(self.processor,)
)
+ @classmethod
+ def _make(cls, iterable):
+ # override factory to affect length check
+ num_fields = len(cls._fields)
+ result = cls.__new__(cls, *iterable)
+ if len(result) != num_fields + 1:
+ msg = f'Expected {num_fields} arguments, got {len(result)}'
+ raise TypeError(msg)
+ return result
+
def __getitem__(self, key):
- return tuple(iter(self))[key]
+ return tuple(self)[key]
def __len__(self):
return len(tuple(iter(self)))
+ def __reduce__(self):
+ return uname_result, tuple(self)[:len(self._fields)]
+
_uname_cache = None
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
index 2c6fbee8b6ffb..1a688775f4630 100644
--- a/Lib/test/test_platform.py
+++ b/Lib/test/test_platform.py
@@ -1,4 +1,6 @@
import os
+import copy
+import pickle
import platform
import subprocess
import sys
@@ -234,6 +236,38 @@ def test_uname_cast_to_tuple(self):
)
self.assertEqual(tuple(res), expected)
+ def test_uname_replace(self):
+ res = platform.uname()
+ new = res._replace(
+ system='system', node='node', release='release',
+ version='version', machine='machine')
+ self.assertEqual(new.system, 'system')
+ self.assertEqual(new.node, 'node')
+ self.assertEqual(new.release, 'release')
+ self.assertEqual(new.version, 'version')
+ self.assertEqual(new.machine, 'machine')
+ # processor cannot be replaced
+ self.assertEqual(new.processor, res.processor)
+
+ def test_uname_copy(self):
+ uname = platform.uname()
+ self.assertEqual(copy.copy(uname), uname)
+ self.assertEqual(copy.deepcopy(uname), uname)
+
+ def test_uname_pickle(self):
+ orig = platform.uname()
+ for proto in range(pickle.HIGHEST_PROTOCOL + 1):
+ with self.subTest(protocol=proto):
+ pickled = pickle.dumps(orig, proto)
+ restored = pickle.loads(pickled)
+ self.assertEqual(restored, orig)
+
+ def test_uname_slices(self):
+ res = platform.uname()
+ expected = tuple(res)
+ self.assertEqual(res[:], expected)
+ self.assertEqual(res[:5], expected[:5])
+
@unittest.skipIf(sys.platform in ['win32', 'OpenVMS'], "uname -p not used")
def test_uname_processor(self):
"""
diff --git a/Misc/NEWS.d/next/Library/2020-10-29-09-22-56.bpo-42163.O4VcCY.rst b/Misc/NEWS.d/next/Library/2020-10-29-09-22-56.bpo-42163.O4VcCY.rst
new file mode 100644
index 0000000000000..0c357eb4ac1da
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2020-10-29-09-22-56.bpo-42163.O4VcCY.rst
@@ -0,0 +1 @@
+Restore compatibility for ``uname_result`` around deepcopy and _replace.
More information about the Python-checkins
mailing list