wip again

masque/shapes/arc.py

@@ -195,7 +195,7 @@ class Arc(Shape, metaclass=AutoSlots):
         self.poly_max_arclen = poly_max_arclen
         [self.mirror(a) for a, do in enumerate(mirrored) if do]
 
-    def __deepcopy__(self, memo: Dict = None) -> 'Arc':
+    def __deepcopy__(self, memo: Optional[Dict] = None) -> 'Arc':
         memo = {} if memo is None else memo
         new = copy.copy(self)
         new._offset = self._offset.copy()

masque/shapes/circle.py

@@ -74,7 +74,7 @@ class Circle(Shape, metaclass=AutoSlots):
         self.poly_num_points = poly_num_points
         self.poly_max_arclen = poly_max_arclen
 
-    def __deepcopy__(self, memo: Dict = None) -> 'Circle':
+    def __deepcopy__(self, memo: Optional[Dict] = None) -> 'Circle':
         memo = {} if memo is None else memo
         new = copy.copy(self)
         new._offset = self._offset.copy()

masque/shapes/ellipse.py

@@ -125,7 +125,7 @@ class Ellipse(Shape, metaclass=AutoSlots):
         self.poly_num_points = poly_num_points
         self.poly_max_arclen = poly_max_arclen
 
-    def __deepcopy__(self, memo: Dict = None) -> 'Ellipse':
+    def __deepcopy__(self, memo: Optional[Dict] = None) -> 'Ellipse':
         memo = {} if memo is None else memo
         new = copy.copy(self)
         new._offset = self._offset.copy()

masque/shapes/path.py

@@ -185,7 +185,7 @@ class Path(Shape, metaclass=AutoSlots):
         self.rotate(rotation)
         [self.mirror(a) for a, do in enumerate(mirrored) if do]
 
-    def __deepcopy__(self, memo: Dict = None) -> 'Path':
+    def __deepcopy__(self, memo: Optional[Dict] = None) -> 'Path':
         memo = {} if memo is None else memo
         new = copy.copy(self)
         new._offset = self._offset.copy()
@@ -245,8 +245,8 @@ class Path(Shape, metaclass=AutoSlots):
 
     def to_polygons(
             self,
-            poly_num_points: int = None,
-            poly_max_arclen: float = None,
+            poly_num_points: Optional[int] = None,
+            poly_max_arclen: Optional[float] = None,
             ) -> List['Polygon']:
         extensions = self._calculate_cap_extensions()
 

masque/shapes/polygon.py

@@ -345,8 +345,8 @@ class Polygon(Shape, metaclass=AutoSlots):
 
     def to_polygons(
             self,
-            poly_num_points: int = None,        # unused
-            poly_max_arclen: float = None,      # unused
+            poly_num_points: Optional[int] = None,        # unused
+            poly_max_arclen: Optional[float] = None,      # unused
             ) -> List['Polygon']:
         return [copy.deepcopy(self)]
 

masque/shapes/shape.py

@@ -176,7 +176,7 @@ class Shape(PositionableImpl, LayerableImpl, DoseableImpl, Rotatable, Mirrorable
                     return inds
 
                 # Find the y indices on all x gridlines
-                xs = gx[gxi_min:gxi_max]
+                xs = gx[int(gxi_min):int(gxi_max)]
                 inds = get_grid_inds(xs)
 
                 # Find y-intersections for x-midpoints

masque/shapes/text.py

@@ -100,7 +100,7 @@ class Text(RotatableImpl, Shape, metaclass=AutoSlots):
             self.annotations = annotations if annotations is not None else {}
         self.font_path = font_path
 
-    def __deepcopy__(self, memo: Dict = None) -> 'Text':
+    def __deepcopy__(self, memo: Optional[Dict] = None) -> 'Text':
         memo = {} if memo is None else memo
         new = copy.copy(self)
         new._offset = self._offset.copy()