Replace Optional[T] with T | None

Author: mitya57

secretstorage/collection.py

@@ -17,7 +17,6 @@
 """
 
 from collections.abc import Iterator
-from typing import Optional
 
 from jeepney.io.blocking import DBusConnection
 
@@ -48,7 +47,7 @@ class Collection:
 
     def __init__(self, connection: DBusConnection,
                  collection_path: str = DEFAULT_COLLECTION,
-                 session: Optional[Session] = None) -> None:
+                 session: Session | None = None) -> None:
         self.connection = connection
         self.session = session
         self.collection_path = collection_path
@@ -154,7 +153,7 @@ def __repr__(self) -> str:
 
 
 def create_collection(connection: DBusConnection, label: str, alias: str = '',
-                      session: Optional[Session] = None) -> Collection:
+                      session: Session | None = None) -> Collection:
     """Creates a new :class:`Collection` with the given `label` and `alias`
     and returns it. This action requires prompting.
 
@@ -185,7 +184,7 @@ def get_all_collections(connection: DBusConnection) -> Iterator[Collection]:
 
 
 def get_default_collection(connection: DBusConnection,
-                           session: Optional[Session] = None) -> Collection:
+                           session: Session | None = None) -> Collection:
     """Returns the default collection. If it doesn't exist,
     creates it."""
     try:

secretstorage/dhcrypto.py

@@ -11,7 +11,6 @@
 import math
 import os
 from hashlib import sha256
-from typing import Optional
 
 # A standard 1024 bits (128 bytes) prime number for use in Diffie-Hellman exchange
 DH_PRIME_1024_BYTES = (
@@ -37,8 +36,8 @@ def int_to_bytes(number: int) -> bytes:
 
 class Session:
     def __init__(self) -> None:
-        self.object_path: Optional[str] = None
-        self.aes_key: Optional[bytes] = None
+        self.object_path: str | None = None
+        self.aes_key: bytes | None = None
         self.encrypted = True
         # 128-bytes-long strong random number
         self.my_private_key = int.from_bytes(os.urandom(0x80), 'big')

secretstorage/item.py

@@ -9,8 +9,6 @@
 the item is unlocked. The collection can be unlocked using collection's
 :meth:`~secretstorage.collection.Collection.unlock` method."""
 
-from typing import Optional
-
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives.ciphers import Cipher, algorithms, modes
 from jeepney.io.blocking import DBusConnection
@@ -33,7 +31,7 @@ class Item:
     """Represents a secret item."""
 
     def __init__(self, connection: DBusConnection,
-                 item_path: str, session: Optional[Session] = None) -> None:
+                 item_path: str, session: Session | None = None) -> None:
         self.item_path = item_path
         self._item = DBusAddressWrapper(item_path, ITEM_IFACE, connection)
         self._item.get_property('Label')