From: Jo Sutton <josutton@catalyst.net.nz>
Date: Thu, 1 Feb 2024 23:23:58 +0000 (+1300)
Subject: python: Remove ‘typing.Final’
X-Git-Tag: tdb-1.4.11~1836
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d6fe66ddeeb99c550fa9a0f1abb845e6daf71f8a;p=thirdparty%2Fsamba.git

python: Remove ‘typing.Final’

This is only present in Python 3.8 and above.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=15575

Signed-off-by: Jo Sutton <josutton@catalyst.net.nz>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
---

diff --git a/python/samba/gkdi.py b/python/samba/gkdi.py
index 9e3abb58a2f..4179263b769 100644
--- a/python/samba/gkdi.py
+++ b/python/samba/gkdi.py
@@ -20,7 +20,7 @@
 
 from enum import Enum
 from functools import total_ordering
-from typing import Final, Optional, Tuple
+from typing import Optional, Tuple
 
 from cryptography.hazmat.primitives import hashes
 
@@ -30,14 +30,14 @@ from samba.ndr import ndr_pack, ndr_unpack
 from samba.nt_time import NtTime, NtTimeDelta
 
 
-uint64_max: Final[int] = 2**64 - 1
+uint64_max: int = 2**64 - 1
 
-L1_KEY_ITERATION: Final[int] = _glue.GKDI_L1_KEY_ITERATION
-L2_KEY_ITERATION: Final[int] = _glue.GKDI_L2_KEY_ITERATION
-KEY_CYCLE_DURATION: Final[NtTimeDelta] = _glue.GKDI_KEY_CYCLE_DURATION
-MAX_CLOCK_SKEW: Final[NtTimeDelta] = _glue.GKDI_MAX_CLOCK_SKEW
+L1_KEY_ITERATION: int = _glue.GKDI_L1_KEY_ITERATION
+L2_KEY_ITERATION: int = _glue.GKDI_L2_KEY_ITERATION
+KEY_CYCLE_DURATION: NtTimeDelta = _glue.GKDI_KEY_CYCLE_DURATION
+MAX_CLOCK_SKEW: NtTimeDelta = _glue.GKDI_MAX_CLOCK_SKEW
 
-KEY_LEN_BYTES: Final = 64
+KEY_LEN_BYTES = 64
 
 
 class Algorithm(Enum):
@@ -107,7 +107,7 @@ class UndefinedStartTime(Exception):
 class Gkid:
     __slots__ = ["_l0_idx", "_l1_idx", "_l2_idx"]
 
-    max_l0_idx: Final = 0x7FFF_FFFF
+    max_l0_idx = 0x7FFF_FFFF
 
     def __init__(self, l0_idx: int, l1_idx: int, l2_idx: int) -> None:
         if not -1 <= l0_idx <= Gkid.max_l0_idx:
diff --git a/python/samba/tests/gkdi.py b/python/samba/tests/gkdi.py
index b59a837a9ca..375b444414c 100644
--- a/python/samba/tests/gkdi.py
+++ b/python/samba/tests/gkdi.py
@@ -25,7 +25,7 @@ os.environ["PYTHONUNBUFFERED"] = "1"
 
 import datetime
 import secrets
-from typing import Final, NewType, Optional, Tuple, Union
+from typing import NewType, Optional, Tuple, Union
 
 import ldb
 
@@ -72,7 +72,7 @@ HResult = NewType("HResult", int)
 RootKey = NewType("RootKey", ldb.Message)
 
 
-ROOT_KEY_START_TIME: Final = NtTime(KEY_CYCLE_DURATION + MAX_CLOCK_SKEW)
+ROOT_KEY_START_TIME = NtTime(KEY_CYCLE_DURATION + MAX_CLOCK_SKEW)
 
 
 class GetKeyError(Exception):