cleanup

masque/builder/builder.py

@@ -8,7 +8,7 @@ from numpy.typing import ArrayLike
 
 from ..pattern import Pattern
 from ..ref import Ref
-from ..library import MutableLibrary, Tree
+from ..library import MutableLibrary
 from ..error import PortError, BuildError
 from ..ports import PortList, Port
 from ..abstract import Abstract
@@ -602,7 +602,7 @@ class Pather(Builder):
             library: MutableLibrary,
             base_name: str,
             *,
-            ports: str | Mapping[str, Port] | None= None,
+            ports: str | Mapping[str, Port] | None = None,
             tools: Tool | MutableMapping[str | None, Tool] | None = None,
             ) -> tuple['Pather', str]:
         """ Name-and-make combination """

masque/file/oasis.py

@@ -646,9 +646,9 @@ def repetition_fata2masq(
 def repetition_masq2fata(
         rep: Repetition | None,
         ) -> tuple[
-                fatamorgana.GridRepetition | fatamorgana.ArbitraryRepetition | None,
+            fatamorgana.GridRepetition | fatamorgana.ArbitraryRepetition | None,
-                tuple[int, int]
+            tuple[int, int]
-                ]:
+            ]:
     frep: fatamorgana.GridRepetition | fatamorgana.ArbitraryRepetition | None
     if isinstance(rep, Grid):
         a_vector = rint_cast(rep.a_vector)

masque/ref.py

@@ -4,7 +4,7 @@
 """
 #TODO more top-level documentation
 
-from typing import Sequence, Mapping, TYPE_CHECKING, Any, Self, cast
+from typing import Sequence, Mapping, TYPE_CHECKING, Any, Self
 import copy
 
 import numpy

masque/shapes/shape.py

@@ -33,7 +33,7 @@ class Shape(PositionableImpl, LayerableImpl, Rotatable, Mirrorable, Copyable, Sc
     """
     __slots__ = ()      # Children should use AutoSlots
 
-    def __copy__(self) -> 'Shape':
+    def __copy__(self) -> Self:
         cls = self.__class__
         new = cls.__new__(cls)
         for name in self.__slots__:     # type: str

masque/traits/annotatable.py

@@ -1,4 +1,3 @@
-from typing import Self
 #from types import MappingProxyType
 from abc import ABCMeta, abstractmethod