mirror of
https://github.com/python/cpython
synced 2024-09-05 00:05:39 +00:00
gh-113308: Remove some internal parts of uuid
module (#115934)
Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
This commit is contained in:
parent
66fb613d90
commit
61f576a5ef
|
@ -530,7 +530,14 @@ def test_uuid1(self):
|
|||
@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 @@ def mock_generate_time_safe(self, safe_value):
|
|||
"""
|
||||
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 @@ def test_uuid1_bogus_return_value(self):
|
|||
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 @@ def test_uuid1_time(self):
|
|||
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)
|
||||
|
|
16
Lib/uuid.py
16
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():
|
||||
|
|
|
@ -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.
|
Loading…
Reference in a new issue