update typehints

Author: aminalaee

python/uuid_utils/__init__.pyi

@@ -3,7 +3,7 @@ import sys
 from typing import Final
 from uuid import SafeUUID
 
-from typing_extensions import TypeAlias
+from typing_extensions import LiteralString, TypeAlias
 
 # Because UUID has properties called int and bytes we need to rename these temporarily.
 _FieldsType: TypeAlias = tuple[int, int, int, int, int, int]
@@ -65,6 +65,9 @@ class UUID:
                     otherwise raises ValueError.
     """
 
+    is_safe: Final[SafeUUID]
+    int: Final[builtins.int]
+
     def __init__(
         self,
         hex: str | None = None,
@@ -77,8 +80,6 @@ class UUID:
         is_safe: SafeUUID = ...,
     ) -> None: ...
     @property
-    def is_safe(self) -> SafeUUID: ...
-    @property
     def bytes(self) -> builtins.bytes: ...
     @property
     def bytes_le(self) -> builtins.bytes: ...
@@ -93,8 +94,6 @@ class UUID:
     @property
     def hex(self) -> str: ...
     @property
-    def int(self) -> builtins.int: ...
-    @property
     def node(self) -> builtins.int: ...
     @property
     def time(self) -> builtins.int: ...
@@ -182,14 +181,14 @@ def uuid8(bytes: bytes) -> UUID:
     """Generate a custom UUID comprised almost entirely of user-supplied bytes."""
     ...
 
-NAMESPACE_DNS: UUID
-NAMESPACE_URL: UUID
-NAMESPACE_OID: UUID
-NAMESPACE_X500: UUID
-RESERVED_NCS: str
-RFC_4122: str
-RESERVED_MICROSOFT: str
-RESERVED_FUTURE: str
+NAMESPACE_DNS: Final[UUID]
+NAMESPACE_URL: Final[UUID]
+NAMESPACE_OID: Final[UUID]
+NAMESPACE_X500: Final[UUID]
+RESERVED_NCS: Final[LiteralString]
+RFC_4122: Final[LiteralString]
+RESERVED_MICROSOFT: Final[LiteralString]
+RESERVED_FUTURE: Final[LiteralString]
 NIL: Final[UUID]
 MAX: Final[UUID]
 

python/uuid_utils/compat/__init__.pyi

@@ -14,13 +14,7 @@ from uuid import (
     getnode,
 )
 
-from typing_extensions import TypeAlias
-
-# Because UUID has properties called int and bytes we need to rename these temporarily.
-_Int: TypeAlias = int
-_Bytes: TypeAlias = bytes
-
-def uuid1(node: _Int | None = None, clock_seq: _Int | None = None) -> UUID:
+def uuid1(node: int | None = None, clock_seq: int | None = None) -> UUID:
     """Generate a UUID from a host ID, sequence number, and the current time.
     If 'node' is not given, getnode() is used to obtain the hardware
     address.  If 'clock_seq' is given, it is used as the sequence number;
@@ -50,18 +44,18 @@ else:
         """Generate a UUID from the SHA-1 hash of a namespace UUID and a name."""
         ...
 
-def uuid6(node: _Int | None = None, timestamp: _Int | None = None) -> UUID:
+def uuid6(node: int | None = None, timestamp: int | None = None) -> UUID:
     """Generate a version 6 UUID using the given timestamp and a host ID.
     This is similar to version 1 UUIDs,
     except that it is lexicographically sortable by timestamp.
     """
     ...
 
-def uuid7(timestamp: _Int | None = None, nanos: _Int | None = None) -> UUID:
+def uuid7(timestamp: int | None = None, nanos: int | None = None) -> UUID:
     """Generate a version 7 UUID using a time value and random bytes."""
     ...
 
-def uuid8(bytes: _Bytes) -> UUID:
+def uuid8(bytes: bytes) -> UUID:
     """Generate a custom UUID comprised almost entirely of user-supplied bytes.."""
     ...