import annotations from future for python3.9 union/optional types

Author: TabulateJarl8

pyproject.toml

@@ -76,6 +76,9 @@ exclude_also = [
 omit = ["*/__main__.py"]
 
 
+[tool.ruff]
+target-version = "py39"
+
 [tool.ruff.lint]
 preview = true
 extend-select = [

tests/test_ui.py

@@ -1,6 +1,7 @@
 """Vapor UI tests."""
 
-from typing import Optional
+from __future__ import annotations
+
 from unittest.mock import Mock, patch
 
 import pytest
@@ -45,7 +46,7 @@ def config() -> Config:
 class MockCache:
 	"""Mock Cache object with set anticheat data."""
 
-	def get_anticheat_data(self, app_id: str) -> Optional[AntiCheatData]:
+	def get_anticheat_data(self, app_id: str) -> AntiCheatData | None:
 		"""Return anticheat status denied for id 123."""
 		if app_id == '123':
 			return AntiCheatData('123', AntiCheatStatus.DENIED)

vapor/api_interface.py

@@ -1,7 +1,8 @@
 """Steam and ProtonDB API helper functions."""
 
+from __future__ import annotations
+
 import json
-from typing import Optional
 
 import aiohttp
 
@@ -68,13 +69,13 @@ async def check_game_is_native(app_id: str) -> bool:
 	)
 
 
-async def get_anti_cheat_data() -> Optional[Cache]:
+async def get_anti_cheat_data() -> Cache | None:
 	"""Get the anti-cheat data from cache.
 
 	If expired, this function will fetch new data and write that to cache.
 
 	Returns:
-		Optional[Cache]: The cache containing anti-cheat data.
+		Cache | None: The cache containing anti-cheat data.
 	"""
 	cache = Cache().load_cache()
 	if cache.has_anticheat_cache:

vapor/cache_handler.py

@@ -5,7 +5,6 @@
 import json
 from datetime import datetime
 from pathlib import Path
-from typing import Optional
 
 from typing_extensions import Self, override
 
@@ -86,37 +85,37 @@ def has_anticheat_cache(self) -> bool:
 		"""Whether or not there is anticheat cache loaded."""
 		return bool(self._anti_cheat_data)
 
-	def get_game_data(self, app_id: str) -> Optional[Game]:
+	def get_game_data(self, app_id: str) -> Game | None:
 		"""Get game data from app ID.
 
 		Args:
 			app_id (str): The game's app ID.
 
 		Returns:
-			Optional[Game]: The game data if exists. If not, None.
+			Game | None: The game data if exists. If not, None.
 		"""
 		data = self._games_data.get(app_id, None)
 		if data is not None:
 			return data[0]
 
 		return None
 
-	def get_anticheat_data(self, app_id: str) -> Optional[AntiCheatData]:
+	def get_anticheat_data(self, app_id: str) -> AntiCheatData | None:
 		"""Get anticheat data from app ID.
 
 		Args:
 			app_id (str): The game's app ID.
 
 		Returns:
-			Optional[AntiCheatData]: The game anticheat data if exists. If not, None.
+			AntiCheatData | None: The game anticheat data if exists. If not, None.
 		"""
 		data = self._anti_cheat_data.get(app_id, None)
 		if data is not None:
 			return data
 
 		return None
 
-	def load_cache(self, prune: Optional[bool] = True) -> Self:
+	def load_cache(self, prune: bool | None = True) -> Self:
 		"""Load and deserialize the cache.
 
 		Args:
@@ -159,15 +158,15 @@ def load_cache(self, prune: Optional[bool] = True) -> Self:
 
 	def update_cache(
 		self,
-		game_list: Optional[list[Game]] = None,
-		anti_cheat_list: Optional[list[AntiCheatData]] = None,
+		game_list: list[Game] | None = None,
+		anti_cheat_list: list[AntiCheatData] | None = None,
 	) -> Self:
 		"""Update the cache file with new game and anticheat data.
 
 		Args:
-			game_list (Optional[list[Game]]): list of new game data.
+			game_list (list[Game] | None): list of new game data.
 				Defaults to None.
-			anti_cheat_list (Optional[list[AntiCheatData]]): list of new
+			anti_cheat_list (list[AntiCheatData] | None): list of new
 				anticheat data. Defaults to None.
 
 		Returns:

vapor/config_handler.py

@@ -1,8 +1,9 @@
 """Vapor configuration file handling."""
 
+from __future__ import annotations
+
 from configparser import ConfigParser
 from pathlib import Path
-from typing import Optional
 
 from typing_extensions import Self
 
@@ -22,7 +23,7 @@ class Config:
 	def __init__(self) -> None:
 		"""Construct a new Config object."""
 		self._config_path: Path = CONFIG_PATH
-		self._config_data: Optional[ConfigParser] = None
+		self._config_data: ConfigParser | None = None
 
 	def set_value(self, key: str, value: str) -> Self:
 		"""Set a value in the config file.

vapor/main.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from pathlib import Path
-from typing import ClassVar, Optional, Union, cast
+from typing import ClassVar, cast
 from urllib.parse import urlparse
 
 from rich.text import Text
@@ -108,13 +108,13 @@ def on_button_pressed(self) -> None:
 class SteamApp(App[None]):
 	"""Main application class."""
 
-	CSS_PATH: ClassVar[Optional[CSSPathType]] = 'main.tcss'
-	TITLE: Optional[str] = 'Steam Profile Proton Compatibility Checker'
+	CSS_PATH: ClassVar[CSSPathType | None] = 'main.tcss'
+	TITLE: str | None = 'Steam Profile Proton Compatibility Checker'
 	BINDINGS: ClassVar[list[BindingType]] = [
 		Binding('ctrl+s', "push_screen('settings')", 'Settings', show=True),
 	]
 
-	def __init__(self, custom_config: Optional[Config] = None) -> None:
+	def __init__(self, custom_config: Config | None = None) -> None:
 		"""Construct the application.
 
 		This reads and instantiates the config.
@@ -155,15 +155,15 @@ def compose(self) -> ComposeResult:
 					id='user-rating',
 				),
 			),
-			DataTable[Union[str, Text]](zebra_stripes=True),
+			DataTable[str | Text](zebra_stripes=True),
 			id='body',
 		)
 		yield Footer()
 
 	def on_mount(self) -> None:
 		"""On mount, we initialize the table columns."""
 		# add nothing to table so that it shows up
-		table: DataTable[Union[str, Text]] = self.query_one(DataTable)
+		table: DataTable[str | Text] = self.query_one(DataTable)
 		table.add_columns('Title', 'Compatibility', 'Anti-Cheat Compatibility')
 
 		for _ in range(12):
@@ -190,7 +190,7 @@ async def populate_table(self) -> None:
 				item.refresh()
 
 			# set the DataTable as loading
-			table: DataTable[Union[str, Text]] = self.query_one(DataTable)
+			table: DataTable[str | Text] = self.query_one(DataTable)
 			table.set_loading(loading=True)
 
 			# get user's API key and ID