remove references to v7 and v8

Author: picnixz

Doc/library/uuid.rst

@@ -12,7 +12,7 @@
 
 This module provides immutable :class:`UUID` objects (the :class:`UUID` class)
 and the functions :func:`uuid1`, :func:`uuid3`, :func:`uuid4`, :func:`uuid5` for
-generating version 1, 3, 4, and 5 UUIDs as specified in :rfc:`4122`.
+generating version 1, 3, 4, 5, and 6 UUIDs as specified in :rfc:`4122`.
 
 If all you want is a unique ID, you should probably call :func:`uuid1` or
 :func:`uuid4`.  Note that :func:`uuid1` may compromise privacy since it creates
@@ -149,11 +149,11 @@ which relays any information about the UUID's safety, using this enumeration:
 
 .. attribute:: UUID.version
 
-   The UUID version number (1 through 8, meaningful only when the variant is
+   The UUID version number (1 through 6, meaningful only when the variant is
    :const:`RFC_4122`).
 
    .. versionadded:: 3.14
-      Added UUID versions 6, 7, and 8.
+      Added UUID version 6.
 
 .. attribute:: UUID.is_safe
 
@@ -229,24 +229,6 @@ The :mod:`uuid` module defines the following functions:
 .. index:: single: uuid6
 
 
-.. function:: uuid7()
-
-   TODO
-
-   .. versionadded:: 3.14
-
-.. index:: single: uuid7
-
-
-.. function:: uuid8(a=None, b=None, c=None)
-
-   TODO
-
-   .. versionadded:: 3.14
-
-.. index:: single: uuid8
-
-
 The :mod:`uuid` module defines the following namespace identifiers for use with
 :func:`uuid3` or :func:`uuid5`.
 

Doc/whatsnew/3.14.rst

@@ -121,12 +121,8 @@ symtable
 uuid
 ----
 
-* Add support for UUID versions 6, 7, and 8 as specified by
-  :rfc:`9562` to the :mod:`uuid` module:
-
-  * :func:`~uuid.uuid6`
-  * :func:`~uuid.uuid7`
-  * :func:`~uuid.uuid8`
+* Add support for UUID version 6 via :func:`uuid.uuid6` as specified
+  in :rfc:`9562`.
 
   (Contributed by Bénédikt Tran in :gh:`89083`.)
 

Lib/test/test_uuid.py

@@ -1,4 +1,3 @@
-import random
 import unittest
 from test import support
 from test.support import import_helper
@@ -11,7 +10,6 @@
 import pickle
 import sys
 import weakref
-from itertools import product
 from unittest import mock
 
 py_uuid = import_helper.import_fresh_module('uuid', blocked=['_uuid'])
@@ -712,56 +710,6 @@ def test_uuid6(self):
             equal(u.fields[4], 0b11000101)  # 8 low bits of clock_seq
             equal(u.fields[5], fake_node_value)
 
-    def test_uuid7(self):
-        equal = self.assertEqual
-        u = self.uuid.uuid7()
-        equal(u.variant, self.uuid.RFC_4122)
-        equal(u.version, 7)
-
-        fake_nanoseconds = 1545052026752910643
-        # some fake 74 = 12 + 62 random bits speared over 76 bits
-        # are generated by generating a random 76-bit number, and
-        # split into chunks of 62 (hi) and 12 (lo) bits.
-        for _ in range(100):
-            rand_a = random.getrandbits(12)
-            rand_b = random.getrandbits(62)
-            fake_bytes = (rand_b << 12) | rand_a
-            fake_bytes = fake_bytes.to_bytes(10, byteorder='big')
-
-            with mock.patch.object(self.uuid, '_last_timestamp_v7', None), \
-                    mock.patch('time.time_ns', return_value=fake_nanoseconds), \
-                    mock.patch('os.urandom', return_value=fake_bytes):
-                u = self.uuid.uuid7()
-                equal(u.variant, self.uuid.RFC_4122)
-                equal(u.version, 7)
-                fake_milliseconds = (fake_nanoseconds // 1_000_000) & 0xffffffffffff
-                equal((u.int >> 80) & 0xffffffffffff, fake_milliseconds)
-                equal((u.int >> 64) & 0x0fff, rand_a)
-                equal(u.int & 0x3fffffffffffffff, rand_b)
-
-    def test_uuid8(self):
-        equal = self.assertEqual
-        u = self.uuid.uuid8()
-
-        equal(u.variant, self.uuid.RFC_4122)
-        equal(u.version, 8)
-
-        for (_, hi, mid, lo) in product(
-            range(10),  # repeat 10 times
-            [None, 0, random.getrandbits(48)],
-            [None, 0, random.getrandbits(12)],
-            [None, 0, random.getrandbits(62)],
-        ):
-            u = self.uuid.uuid8(hi, mid, lo)
-            equal(u.variant, self.uuid.RFC_4122)
-            equal(u.version, 8)
-            if hi is not None:
-                equal((u.int >> 80) & 0xffffffffffff, hi)
-            if mid is not None:
-                equal((u.int >> 64) & 0xfff, mid)
-            if lo is not None:
-                equal(u.int & 0x3fffffffffffffff, lo)
-
     @support.requires_fork()
     def testIssue8621(self):
         # On at least some versions of OSX self.uuid.uuid4 generates

Lib/uuid.py

@@ -1,9 +1,9 @@
 r"""UUID objects (universally unique identifiers) according to RFC 4122.
 
 This module provides immutable UUID objects (class UUID) and the functions
-uuid1(), uuid3(), uuid4(), uuid5(), uuid6(), uuid7(), and uuid8() for
-generating version 1 to 8 UUIDs as specified in RFC 4122 (superseeded
-by RFC 9562 but still referred to as RFC 4122 for compatibility purposes).
+uuid1(), uuid3(), uuid4(), uuid5() and uuid6() for generating version 1, 3,
+4, 5, and 6 UUIDs as specified in RFC 4122 (superseeded by RFC 9562 but still
+referred to as RFC 4122 for compatibility purposes).
 
 If all you want is a unique ID, you should probably call uuid1() or uuid4().
 Note that uuid1() may compromise privacy since it creates a UUID containing
@@ -130,7 +130,7 @@ class UUID:
         variant     the UUID variant (one of the constants RESERVED_NCS,
                     RFC_4122, RESERVED_MICROSOFT, or RESERVED_FUTURE)
 
-        version     the UUID version number (1 through 8, meaningful only
+        version     the UUID version number (1 through 6, meaningful only
                     when the variant is RFC_4122)
 
         is_safe     An enum indicating whether the UUID has been generated in
@@ -215,7 +215,7 @@ def __init__(self, hex=None, bytes=None, bytes_le=None, fields=None,
             if not 0 <= int < 1<<128:
                 raise ValueError('int is out of range (need a 128-bit value)')
         if version is not None:
-            if not 1 <= version <= 8:
+            if not 1 <= version <= 6:
                 raise ValueError('illegal version number')
             # Set the variant to RFC 4122.
             int &= ~(0xc000 << 48)
@@ -763,53 +763,6 @@ def uuid6(node=None, clock_seq=None):
     int_uuid_6 |= node & 0xffffffffffff
     return UUID(int=int_uuid_6, version=6)
 
-_last_timestamp_v7 = None
-
-def uuid7():
-    """Generate a UUID from a Unix timestamp in milliseconds and random bits."""
-    global _last_timestamp_v7
-    import time
-    nanoseconds = time.time_ns()
-    timestamp_ms = nanoseconds // 1_000_000
-    if _last_timestamp_v7 is not None and timestamp_ms <= _last_timestamp_v7:
-        timestamp_ms = _last_timestamp_v7 + 1
-    _last_timestamp_v7 = timestamp_ms
-    int_uuid_7 = (timestamp_ms & 0xffffffffffff) << 80
-    # Ideally, we would have 'rand_a' = first 12 bits of 'rand'
-    # and 'rand_b' = lowest 62 bits, but it is easier to test
-    # when we pick 'rand_a' from the lowest bits of 'rand' and
-    # 'rand_b' from the next 62 bits, ignoring the 6 first bits
-    # of 'rand'.
-    rand = int.from_bytes(os.urandom(10))  # 80 random bits (ignore 6 first)
-    int_uuid_7 |= (rand & 0x0fff) << 64  # rand_a
-    int_uuid_7 |= (rand >> 12) & 0x3fffffffffffffff  # rand_b
-    return UUID(int=int_uuid_7, version=7)
-
-def uuid8(a=None, b=None, c=None):
-    """Generate a UUID from three custom blocks.
-
-    'a' is the first 48-bit chunk of the UUID (octets 0-5);
-    'b' is the mid 12-bit chunk (octets 6-7);
-    'c' is the last 62-bit chunk (octets 8-15).
-
-    When a value is not specified, a random value is generated.
-    """
-    if a is None:
-        import random
-        a = random.getrandbits(48)
-    if b is None:
-        import random
-        b = random.getrandbits(12)
-    if c is None:
-        import random
-        c = random.getrandbits(62)
-
-    int_uuid_8 = (a & 0xffffffffffff) << 80
-    int_uuid_8 |= (b & 0xfff) << 64
-    int_uuid_8 |= c & 0x3fffffffffffffff
-    return UUID(int=int_uuid_8, version=8)
-
-
 def main():
     """Run the uuid command line interface."""
     uuid_funcs = {
@@ -818,8 +771,6 @@ def main():
         "uuid4": uuid4,
         "uuid5": uuid5,
         "uuid6": uuid6,
-        "uuid7": uuid7,
-        "uuid8": uuid8,
     }
     uuid_namespace_funcs = ("uuid3", "uuid5")
     namespaces = {

Misc/NEWS.d/next/Library/2024-06-17-17-31-27.gh-issue-89083.nW00Yq.rst

@@ -1,2 +1,2 @@
-Add :func:`~uuid.uuid6`, :func:`~uuid.uuid7` and :func:`~uuid.uuid8` to the
-:mod:`uuid` module as specified by :rfc:`9562`. Patch by Bénédikt Tran.
+Add :func:`uuid.uuid6` for generating UUIDv6 objects as specified in
+:rfc:`9562`. Patch by Bénédikt Tran.