Skip to content

gh-113308: Remove some internal parts of uuid module #115934

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sobolevn merged 9 commits into from
Mar 14, 2024
Merged

gh-113308: Remove some internal parts of uuid module #115934

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1b8a3ad
gh-113308: Deprecate some internal parts of `uuid` module
sobolevn Feb 26, 2024
c198931
Address review
sobolevn Feb 26, 2024
6bea9fc
Do not import `_uuid` twice
sobolevn Feb 26, 2024
48ed729
Merge branch 'main' into issue-113308
sobolevn Mar 3, 2024
ee231d3
Change the PR to remove these internal parts instead
sobolevn Mar 3, 2024
967c59b
Fix CI
sobolevn Mar 3, 2024
10dc8c2
Also remove `has_uuid_generate_time_safe` from `_uuid` module
sobolevn Mar 3, 2024
df762ec
Revert "Also remove `has_uuid_generate_time_safe` from `_uuid` module"
sobolevn Mar 3, 2024
0eec764
Update Lib/test/test_uuid.py
sobolevn Mar 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "Also remove has_uuid_generate_time_safe from _uuid module" 
This reverts commit 10dc8c2.
  • Loading branch information
@sobolevn
sobolevn committed Mar 3, 2024
commit df762ec57a43fcbc1427445a81eada1bb491a9ea
9 changes: 8 additions & 1 deletion Lib/test/test_uuid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,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._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()
Expand Down
1 change: 0 additions & 1 deletion Misc/NEWS.d/next/Library/2024-02-26-10-06-50.gh-issue-113308.MbvOFt.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
Remove some internal protected parts from :mod:`uuid`:
``_has_uuid_generate_time_safe``, ``_netbios_getnode``,
``_ipconfig_getnode``, and ``_load_system_functions``.
Also remove ``has_uuid_generate_time_safe`` from ``_uuid`` module.
They were unused.
11 changes: 11 additions & 0 deletions Modules/_uuidmodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,17 @@ py_UuidCreate(PyObject *Py_UNUSED(context),
static int
uuid_exec(PyObject *module) {
assert(sizeof(uuid_t) == 16);
#if defined(MS_WINDOWS)
int has_uuid_generate_time_safe = 0;
#elif defined(HAVE_UUID_GENERATE_TIME_SAFE)
int has_uuid_generate_time_safe = 1;
#else
int has_uuid_generate_time_safe = 0;
#endif
if (PyModule_AddIntConstant(module, "has_uuid_generate_time_safe",
has_uuid_generate_time_safe) < 0) {
return -1;
}
return 0;
}

Expand Down