From 22e56d9ea2d4a58c2abec86a278cfa2c896ba096 Mon Sep 17 00:00:00 2001 From: Jo Sutton Date: Fri, 2 Feb 2024 12:23:58 +1300 Subject: [PATCH] =?utf8?q?python:=20Remove=20=E2=80=98typing.Final?= =?utf8?q?=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Andrew Bartlett (cherry picked from commit d6fe66ddeeb99c550fa9a0f1abb845e6daf71f8a) Autobuild-User(v4-20-test): Jule Anger Autobuild-Date(v4-20-test): Mon Feb 19 15:35:39 UTC 2024 on atb-devel-224 --- python/samba/gkdi.py | 16 ++++++++-------- python/samba/tests/gkdi.py | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) 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): -- 2.11.4.GIT