Clean up Literal types.

Literal types with multiple parameters are automatically Union's.

Author: HexDecimal

tcod/_internal.py

@@ -2,7 +2,7 @@
 """
 import functools
 import warnings
-from typing import Any, AnyStr, Callable, TypeVar, Union, cast
+from typing import Any, AnyStr, Callable, TypeVar, cast
 
 import numpy as np
 from typing_extensions import Literal, NoReturn
@@ -43,9 +43,7 @@ def pending_deprecate(
     return deprecate(message, category, stacklevel)
 
 
-def verify_order(
-    order: Union[Literal["C"], Literal["F"]]
-) -> Union[Literal["C"], Literal["F"]]:
+def verify_order(order: Literal["C", "F"]) -> Literal["C", "F"]:
     order = order.upper()  # type: ignore
     if order not in ("C", "F"):
         raise TypeError("order must be 'C' or 'F', not %r" % (order,))

tcod/console.py

@@ -93,7 +93,7 @@ def __init__(
         self,
         width: int,
         height: int,
-        order: Union[Literal["C"], Literal["F"]] = "C",
+        order: Literal["C", "F"] = "C",
         buffer: Optional[np.ndarray] = None,
     ):
         self._key_color = None  # type: Optional[Tuple[int, int, int]]
@@ -133,7 +133,7 @@ def __init__(
 
     @classmethod
     def _from_cdata(
-        cls, cdata: Any, order: Union[Literal["C"], Literal["F"]] = "C"
+        cls, cdata: Any, order: Literal["C", "F"] = "C"
     ) -> "Console":
         """Return a Console instance which wraps this `TCOD_Console*` object."""
         if isinstance(cdata, cls):
@@ -144,9 +144,7 @@ def _from_cdata(
         return self
 
     @classmethod
-    def _get_root(
-        cls, order: Optional[Union[Literal["C"], Literal["F"]]] = None
-    ) -> "Console":
+    def _get_root(cls, order: Optional[Literal["C", "F"]] = None) -> "Console":
         """Return a root console singleton with valid buffers.
 
         This function will also update an already active root console.
@@ -161,9 +159,7 @@ def _get_root(
         self._init_setup_console_data(self._order)
         return self
 
-    def _init_setup_console_data(
-        self, order: Union[Literal["C"], Literal["F"]] = "C"
-    ) -> None:
+    def _init_setup_console_data(self, order: Literal["C", "F"] = "C") -> None:
         """Setup numpy arrays over libtcod data buffers."""
         global _root_console
         self._key_color = None

tcod/context.py

@@ -49,7 +49,7 @@
 """  # noqa: E501
 import os
 import sys
-from typing import Any, Iterable, List, Optional, Tuple, Union
+from typing import Any, Iterable, List, Optional, Tuple
 
 from typing_extensions import Literal
 
@@ -269,7 +269,7 @@ def new_console(
         min_columns: int = 1,
         min_rows: int = 1,
         magnification: float = 1.0,
-        order: Union[Literal["C"], Literal["F"]] = "C",
+        order: Literal["C", "F"] = "C",
     ) -> tcod.console.Console:
         """Return a new console sized for this context.
 

tcod/libtcodpy.py

@@ -880,7 +880,7 @@ def console_init_root(
     title: Optional[str] = None,
     fullscreen: bool = False,
     renderer: Optional[int] = None,
-    order: Union[Literal["C"], Literal["F"]] = "C",
+    order: Literal["C", "F"] = "C",
     vsync: Optional[bool] = None,
 ) -> tcod.console.Console:
     """Set up the primary display and return the root console.

tcod/map.py

@@ -3,7 +3,7 @@
 
 """
 import warnings
-from typing import Any, Tuple, Union
+from typing import Any, Tuple
 
 import numpy as np
 from typing_extensions import Literal
@@ -73,7 +73,7 @@ def __init__(
         self,
         width: int,
         height: int,
-        order: Union[Literal["C"], Literal["F"]] = "C",
+        order: Literal["C", "F"] = "C",
     ):
         warnings.warn(
             "This class may perform poorly and is no longer needed.",

tcod/noise.py

@@ -442,7 +442,7 @@ def grid(
     shape: Tuple[int, ...],
     scale: Union[Tuple[float, ...], float],
     origin: Optional[Tuple[int, ...]] = None,
-    indexing: Union[Literal["ij"], Literal["xy"]] = "xy",
+    indexing: Literal["ij", "xy"] = "xy",
 ) -> Tuple[np.ndarray, ...]:
     """A helper function for generating a grid of noise samples.
 

tcod/path.py

@@ -312,7 +312,7 @@ def get_path(self, x: int, y: int) -> List[Tuple[int, int]]:
 def maxarray(
     shape: Tuple[int, ...],
     dtype: Any = np.int32,
-    order: Union[Literal["C"], Literal["F"]] = "C",
+    order: Literal["C", "F"] = "C",
 ) -> np.ndarray:
     """Return a new array filled with the maximum finite value for `dtype`.