Combine 3.11 and 3.12 code in the same file

python-312/typing/alias.py

@@ -1,3 +1,14 @@
-type Ordered[T] = list[T] | tuple[T, ...]
+from typing import TypeAlias, TypeVar
+
+T = TypeVar("T")
+
+Ordered: TypeAlias = list[T] | tuple[T, ...]
 
 numbers: Ordered[int] = (1, 2, 3)
+
+
+# %% Python 3.12
+
+# type Ordered[T] = list[T] | tuple[T, ...]
+#
+# numbers: Ordered[int] = (1, 2, 3)

python-312/typing/concatenation.py

@@ -1,2 +1,13 @@
-def concatenate[T: (str, bytes)](first: T, second: T) -> T:
+from typing import TypeVar
+
+T = TypeVar("T", str, bytes)
+
+
+def concatenate(first: T, second: T) -> T:
     return first + second
+
+
+# %% Python 3.12
+
+# def concatenate[T: (str, bytes)](first: T, second: T) -> T:
+#     return first + second

python-312/typing/deck.py

@@ -1,6 +1,18 @@
 import random
+from typing import TypeAlias
+
+CardDeck: TypeAlias = list[tuple[str, int]]
 
-type CardDeck = list[tuple[str, int]]
 
 def shuffle(deck: CardDeck) -> CardDeck:
     return random.sample(deck, k=len(deck))
+
+
+# %% Python 3.12
+
+# import random
+#
+# type CardDeck = list[tuple[str, int]]
+#
+# def shuffle(deck: CardDeck) -> CardDeck:
+#     return random.sample(deck, k=len(deck))

python-312/typing/generic_queue.py

@@ -1,7 +1,10 @@
 from collections import deque
+from typing import Generic, TypeVar
 
+T = TypeVar("T")
 
-class Queue[T]:
+
+class Queue(Generic[T]):
     def __init__(self) -> None:
         self.elements: deque[T] = deque()
 
@@ -10,3 +13,19 @@ def push(self, element: T) -> None:
 
     def pop(self) -> T:
         return self.elements.popleft()
+
+
+# %% Python 3.12
+
+# from collections import deque
+#
+#
+# class Queue[T]:
+#     def __init__(self) -> None:
+#         self.elements: deque[T] = deque()
+#
+#     def push(self, element: T) -> None:
+#         self.elements.append(element)
+#
+#     def pop(self) -> T:
+#         return self.elements.popleft()

python-312/typing/inspect_string.py

@@ -1,8 +1,25 @@
+from typing import TypeVar
+
+S = TypeVar("S", bound=str)
+
+
 class Words(str):
     def __len__(self):
         return len(self.split())
 
 
-def inspect[S: str](text: S) -> S:
+def inspect(text: S) -> S:
     print(f"'{text.upper()}' has length {len(text)}")
     return text
+
+
+# %% Python 3.12
+
+# class Words(str):
+#     def __len__(self):
+#         return len(self.split())
+#
+#
+# def inspect[S: str](text: S) -> S:
+#     print(f"'{text.upper()}' has length {len(text)}")
+#     return text

python-312/typing/list_helpers.py

@@ -1,3 +1,15 @@
-def push_and_pop[T](elements: list[T], element: T) -> T:
+from typing import TypeVar
+
+T = TypeVar("T")
+
+
+def push_and_pop(elements: list[T], element: T) -> T:
     elements.append(element)
     return elements.pop(0)
+
+
+# %% Python 3.12
+
+# def push_and_pop[T](elements: list[T], element: T) -> T:
+#     elements.append(element)
+#     return elements.pop(0)