summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikita Sobolev <mail@sobolevn.me>2024-03-14 10:01:41 (GMT)
committerGitHub <noreply@github.com>2024-03-14 10:01:41 (GMT)
commit61f576a5eff7cc1a7c163fbed491c1e75e0bd025 (patch)
tree20e329351605f226e49002a769bddb569d2ce09f
parent66fb613d90fe3dea32130a5937963a9362c8a59e (diff)
downloadcpython-61f576a5eff7cc1a7c163fbed491c1e75e0bd025.zip
cpython-61f576a5eff7cc1a7c163fbed491c1e75e0bd025.tar.gz
cpython-61f576a5eff7cc1a7c163fbed491c1e75e0bd025.tar.bz2
gh-113308: Remove some internal parts of `uuid` module (#115934)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
-rwxr-xr-xLib/test/test_uuid.py16
-rw-r--r--Lib/uuid.py16
-rw-r--r--Misc/NEWS.d/next/Library/2024-02-26-10-06-50.gh-issue-113308.MbvOFt.rst4
3 files changed, 14 insertions, 22 deletions
diff --git a/Lib/test/test_uuid.py b/Lib/test/test_uuid.py
index 9cec1e8..e177464 100755
--- a/Lib/test/test_uuid.py
+++ b/Lib/test/test_uuid.py
@@ -530,7 +530,14 @@ class BaseTestUUID:
@support.requires_mac_ver(10, 5)
@unittest.skipUnless(os.name == 'posix', 'POSIX-only test')
def test_uuid1_safe(self):
- if not self.uuid._has_uuid_generate_time_safe:
+ try:
+ import _uuid
+ except ImportError:
+ has_uuid_generate_time_safe = False
+ else:
+ has_uuid_generate_time_safe = _uuid.has_uuid_generate_time_safe
+
+ if not has_uuid_generate_time_safe or not self.uuid._generate_time_safe:
self.skipTest('requires uuid_generate_time_safe(3)')
u = self.uuid.uuid1()
@@ -546,7 +553,6 @@ class BaseTestUUID:
"""
if os.name != 'posix':
self.skipTest('POSIX-only test')
- self.uuid._load_system_functions()
f = self.uuid._generate_time_safe
if f is None:
self.skipTest('need uuid._generate_time_safe')
@@ -581,8 +587,7 @@ class BaseTestUUID:
self.assertEqual(u.is_safe, self.uuid.SafeUUID.unknown)
def test_uuid1_time(self):
- with mock.patch.object(self.uuid, '_has_uuid_generate_time_safe', False), \
- mock.patch.object(self.uuid, '_generate_time_safe', None), \
+ with mock.patch.object(self.uuid, '_generate_time_safe', None), \
mock.patch.object(self.uuid, '_last_timestamp', None), \
mock.patch.object(self.uuid, 'getnode', return_value=93328246233727), \
mock.patch('time.time_ns', return_value=1545052026752910643), \
@@ -590,8 +595,7 @@ class BaseTestUUID:
u = self.uuid.uuid1()
self.assertEqual(u, self.uuid.UUID('a7a55b92-01fc-11e9-94c5-54e1acf6da7f'))
- with mock.patch.object(self.uuid, '_has_uuid_generate_time_safe', False), \
- mock.patch.object(self.uuid, '_generate_time_safe', None), \
+ with mock.patch.object(self.uuid, '_generate_time_safe', None), \
mock.patch.object(self.uuid, '_last_timestamp', None), \
mock.patch('time.time_ns', return_value=1545052026752910643):
u = self.uuid.uuid1(node=93328246233727, clock_seq=5317)
diff --git a/Lib/uuid.py b/Lib/uuid.py
index da2f1d5..c286eac 100644
--- a/Lib/uuid.py
+++ b/Lib/uuid.py
@@ -567,32 +567,16 @@ def _netstat_getnode():
# This works on AIX and might work on Tru64 UNIX.
return _find_mac_under_heading('netstat', '-ian', b'Address')
-def _ipconfig_getnode():
- """[DEPRECATED] Get the hardware address on Windows."""
- # bpo-40501: UuidCreateSequential() is now the only supported approach
- return _windll_getnode()
-
-def _netbios_getnode():
- """[DEPRECATED] Get the hardware address on Windows."""
- # bpo-40501: UuidCreateSequential() is now the only supported approach
- return _windll_getnode()
-
# Import optional C extension at toplevel, to help disabling it when testing
try:
import _uuid
_generate_time_safe = getattr(_uuid, "generate_time_safe", None)
_UuidCreate = getattr(_uuid, "UuidCreate", None)
- _has_uuid_generate_time_safe = _uuid.has_uuid_generate_time_safe
except ImportError:
_uuid = None
_generate_time_safe = None
_UuidCreate = None
- _has_uuid_generate_time_safe = None
-
-
-def _load_system_functions():
- """[DEPRECATED] Platform-specific functions loaded at import time"""
def _unix_getnode():
diff --git a/Misc/NEWS.d/next/Library/2024-02-26-10-06-50.gh-issue-113308.MbvOFt.rst b/Misc/NEWS.d/next/Library/2024-02-26-10-06-50.gh-issue-113308.MbvOFt.rst
new file mode 100644
index 0000000..c4c242f
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2024-02-26-10-06-50.gh-issue-113308.MbvOFt.rst
@@ -0,0 +1,4 @@
+Remove some internal protected parts from :mod:`uuid`:
+``_has_uuid_generate_time_safe``, ``_netbios_getnode``,
+``_ipconfig_getnode``, and ``_load_system_functions``.
+They were unused.