Fixup typing

supriya-project · Jan 16, 2024 · eab193a · eab193a
1 parent 8e2cd94
commit eab193a
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 26 deletions.
diff --git a/supriya/patterns/patterns.py b/supriya/patterns/patterns.py
@@ -38,10 +38,10 @@ class Pattern(metaclass=abc.ABCMeta):
 
     ### SPECIAL METHODS ###
 
-    def __abs__(self) -> UnaryOpPattern:
+    def __abs__(self) -> "UnaryOpPattern":
         return UnaryOpPattern("abs", self)
 
-    def __add__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __add__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("+", self, expr)
 
     def __eq__(self, expr) -> bool:
@@ -52,10 +52,10 @@ def __eq__(self, expr) -> bool:
             expr_values = type(expr), expr
         return self_values == expr_values
 
-    def __floordiv__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __floordiv__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("//", self, expr)
 
-    def __invert__(self) -> UnaryOpPattern:
+    def __invert__(self) -> "UnaryOpPattern":
         return UnaryOpPattern("~", self)
 
     def __iter__(self) -> Generator[Event, bool, None]:
@@ -82,46 +82,46 @@ def __iter__(self) -> Generator[Event, bool, None]:
         if stop_event:
             yield stop_event
 
-    def __mod__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __mod__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("%", self, expr)
 
-    def __mul__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __mul__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("*", self, expr)
 
-    def __neg__(self) -> UnaryOpPattern:
+    def __neg__(self) -> "UnaryOpPattern":
         return UnaryOpPattern("-", self)
 
-    def __pos__(self) -> UnaryOpPattern:
+    def __pos__(self) -> "UnaryOpPattern":
         return UnaryOpPattern("+", self)
 
-    def __pow__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __pow__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("**", self, expr)
 
-    def __radd__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __radd__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("+", expr, self)
 
-    def __rmod__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rmod__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("%", expr, self)
 
-    def __rmul__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rmul__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("*", expr, self)
 
-    def __rpow__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rpow__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("**", expr, self)
 
-    def __rsub__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rsub__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("-", expr, self)
 
-    def __rtruediv__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rtruediv__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("/", expr, self)
 
-    def __rfloordiv__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __rfloordiv__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("//", expr, self)
 
-    def __sub__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __sub__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("-", self, expr)
 
-    def __truediv__(self, expr: Union[Pattern, float]) -> BinaryOpPattern:
+    def __truediv__(self, expr: Union["Pattern", float]) -> "BinaryOpPattern":
         return BinaryOpPattern("/", self, expr)
 
     ### PRIVATE METHODS ###
@@ -224,7 +224,7 @@ def play(
         tempo: Optional[float] = None,
         until: Optional[float] = None,
         uuid: Optional[UUID] = None,
-    ) -> PatternPlayer:
+    ) -> "PatternPlayer":
         from .players import PatternPlayer  # Avoid circular import
 
         if isinstance(context, Score):
@@ -256,8 +256,8 @@ class BinaryOpPattern(Pattern):
     def __init__(
         self,
         operator: str,
-        expr_one: Union[Pattern, float],
-        expr_two: Union[Pattern, float],
+        expr_one: Union["Pattern", float],
+        expr_two: Union["Pattern", float],
     ) -> None:
         self._operator = operator
         self._expr_one = self._freeze_recursive(expr_one)
@@ -293,11 +293,11 @@ def _string_to_operator(self):
     ### PUBLIC PROPERTIES ###
 
     @property
-    def expr_one(self) -> Union[Pattern, float]:
+    def expr_one(self) -> Union["Pattern", float]:
         return self._expr_one
 
     @property
-    def expr_two(self) -> Union[Pattern, float]:
+    def expr_two(self) -> Union["Pattern", float]:
         return self._expr_two
 
     @property
@@ -318,7 +318,7 @@ def operator(self) -> str:
 class UnaryOpPattern(Pattern):
     ### INITIALIZER ###
 
-    def __init__(self, operator: str, expr: Union[Pattern, float]) -> None:
+    def __init__(self, operator: str, expr: Union["Pattern", float]) -> None:
         self._operator = operator
         self._expr = expr
 
@@ -345,7 +345,7 @@ def _string_to_operator(self):
     ### PUBLIC PROPERTIES ###
 
     @property
-    def expr(self) -> Union[Pattern, float]:
+    def expr(self) -> Union["Pattern", float]:
         return self._expr
 
     @property

diff --git a/supriya/patterns/structure.py b/supriya/patterns/structure.py
@@ -7,7 +7,6 @@
 from supriya.assets import synthdefs
 from supriya.enums import CalculationRate
 
-from ..contexts import Bus, Node
 from .events import (
     BusAllocateEvent,
     BusFreeEvent,