improved types

Author: viblo

pymunk/_callbacks.py

@@ -14,7 +14,13 @@
 
 
 @ffi.def_extern()
-def ext_cpSpacePointQueryFunc(_shape, point, distance, gradient, data):  # type: ignore
+def ext_cpSpacePointQueryFunc(
+    _shape: ffi.CData,
+    point: ffi.CData,
+    distance: float,
+    gradient: ffi.CData,
+    data: ffi.CData,
+) -> None:
     self, query_hits = ffi.from_handle(data)
     shape = self._get_shape(_shape)
     p = PointQueryInfo(
@@ -24,7 +30,13 @@ def ext_cpSpacePointQueryFunc(_shape, point, distance, gradient, data):  # type:
 
 
 @ffi.def_extern()
-def ext_cpSpaceSegmentQueryFunc(_shape, point, normal, alpha, data):  # type: ignore
+def ext_cpSpaceSegmentQueryFunc(
+    _shape: ffi.CData,
+    point: ffi.CData,
+    normal: ffi.CData,
+    alpha: float,
+    data: ffi.CData,
+) -> None:
     self, query_hits = ffi.from_handle(data)
     shape = self._get_shape(_shape)
     p = SegmentQueryInfo(
@@ -34,15 +46,17 @@ def ext_cpSpaceSegmentQueryFunc(_shape, point, normal, alpha, data):  # type: ig
 
 
 @ffi.def_extern()
-def ext_cpSpaceBBQueryFunc(_shape, data):  # type: ignore
+def ext_cpSpaceBBQueryFunc(_shape: ffi.CData, data: ffi.CData) -> None:
     self, query_hits = ffi.from_handle(data)
     shape = self._get_shape(_shape)
     assert shape is not None
     query_hits.append(shape)
 
 
 @ffi.def_extern()
-def ext_cpSpaceShapeQueryFunc(_shape, _points, data):  # type: ignore
+def ext_cpSpaceShapeQueryFunc(
+    _shape: ffi.CData, _points: ffi.CData, data: ffi.CData
+) -> None:
     self, query_hits = ffi.from_handle(data)
     found_shape = self._get_shape(_shape)
     point_set = ContactPointSet._from_cp(_points)
@@ -54,19 +68,21 @@ def ext_cpSpaceShapeQueryFunc(_shape, _points, data):  # type: ignore
 
 
 @ffi.def_extern()
-def ext_cpSpaceShapeIteratorFunc(cp_shape, data):  # type: ignore
+def ext_cpSpaceShapeIteratorFunc(cp_shape: ffi.CData, data: ffi.CData) -> None:
     cp_shapes = ffi.from_handle(data)
     cp_shapes.append(cp_shape)
 
 
 @ffi.def_extern()
-def ext_cpSpaceConstraintIteratorFunc(cp_constraint, data):  # type: ignore
+def ext_cpSpaceConstraintIteratorFunc(
+    cp_constraint: ffi.CData, data: ffi.CData
+) -> None:
     cp_constraints = ffi.from_handle(data)
     cp_constraints.append(cp_constraint)
 
 
 @ffi.def_extern()
-def ext_cpSpaceBodyIteratorFunc(cp_body, data):  # type:ignore
+def ext_cpSpaceBodyIteratorFunc(cp_body: ffi.CData, data: ffi.CData) -> None:
     cp_bodys = ffi.from_handle(data)
     cp_bodys.append(cp_body)
 
@@ -75,7 +91,14 @@ def ext_cpSpaceBodyIteratorFunc(cp_body, data):  # type:ignore
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawCircleImpl(pos, angle, radius, outline_color, fill_color, data):  # type: ignore
+def ext_cpSpaceDebugDrawCircleImpl(
+    pos: ffi.CData,
+    angle: float,
+    radius: float,
+    outline_color: ffi.CData,
+    fill_color: ffi.CData,
+    data: ffi.CData,
+) -> None:
     options, _ = ffi.from_handle(data)
     options.draw_circle(
         Vec2d(pos.x, pos.y),
@@ -87,7 +110,9 @@ def ext_cpSpaceDebugDrawCircleImpl(pos, angle, radius, outline_color, fill_color
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawSegmentImpl(a, b, color, data):  # type: ignore
+def ext_cpSpaceDebugDrawSegmentImpl(
+    a: ffi.CData, b: ffi.CData, color: ffi.CData, data: ffi.CData
+) -> None:
     # sometimes a and/or b can be nan. For example if both endpoints
     # of a spring is at the same position. In those cases skip calling
     # the drawing method.
@@ -102,7 +127,14 @@ def ext_cpSpaceDebugDrawSegmentImpl(a, b, color, data):  # type: ignore
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawFatSegmentImpl(a, b, radius, outline_color, fill_color, data):  # type: ignore
+def ext_cpSpaceDebugDrawFatSegmentImpl(
+    a: ffi.CData,
+    b: ffi.CData,
+    radius: float,
+    outline_color: ffi.CData,
+    fill_color: ffi.CData,
+    data: ffi.CData,
+) -> None:
     options, _ = ffi.from_handle(data)
     options.draw_fat_segment(
         Vec2d(a.x, a.y),
@@ -114,7 +146,14 @@ def ext_cpSpaceDebugDrawFatSegmentImpl(a, b, radius, outline_color, fill_color,
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawPolygonImpl(count, verts, radius, outline_color, fill_color, data):  # type: ignore
+def ext_cpSpaceDebugDrawPolygonImpl(
+    count: int,
+    verts: ffi.CData,
+    radius: float,
+    outline_color: ffi.CData,
+    fill_color: ffi.CData,
+    data: ffi.CData,
+) -> None:
     options, _ = ffi.from_handle(data)
     vs = []
     for i in range(count):
@@ -123,13 +162,15 @@ def ext_cpSpaceDebugDrawPolygonImpl(count, verts, radius, outline_color, fill_co
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawDotImpl(size, pos, color, data):  # type: ignore
+def ext_cpSpaceDebugDrawDotImpl(
+    size: float, pos: ffi.CData, color: ffi.CData, data: ffi.CData
+) -> None:
     options, _ = ffi.from_handle(data)
     options.draw_dot(size, Vec2d(pos.x, pos.y), options._c(color))
 
 
 @ffi.def_extern()
-def ext_cpSpaceDebugDrawColorForShapeImpl(_shape, data):  # type: ignore
+def ext_cpSpaceDebugDrawColorForShapeImpl(_shape: ffi.CData, data: ffi.CData) -> None:
     options, space = ffi.from_handle(data)
     shape = space._get_shape(_shape)
     return options.color_for_shape(shape)

pymunk/body.py

@@ -198,7 +198,7 @@ def __init__(
 
         """
 
-        def freebody(cp_body):  # type: ignore
+        def freebody(cp_body: ffi.CData) -> None:
             _logger.debug("bodyfree start %s", cp_body)
 
             # remove all shapes on this body from the space
@@ -641,7 +641,7 @@ def each_arbiter(
         self,
         func: Callable[..., None],  # TODO: Fix me once PEP 612 is ready
         *args: Any,
-        **kwargs: Any
+        **kwargs: Any,
     ) -> None:
         """Run func on each of the arbiters on this body.
 

pymunk/contact_point_set.py

@@ -65,7 +65,7 @@ def __repr__(self) -> str:
         return "ContactPointSet(normal={}, points={})".format(self.normal, self.points)
 
     @classmethod
-    def _from_cp(cls, _points: "ffi.CData") -> "ContactPointSet":
+    def _from_cp(cls, _points: ffi.CData) -> "ContactPointSet":
         normal = Vec2d(_points.normal.x, _points.normal.y)
 
         points = []

pymunk/shapes.py

@@ -58,7 +58,7 @@ def _init(self, body: Optional["Body"], _shape: ffi.CData) -> None:
         if body is not None:
             body._shapes.add(self)
 
-        def shapefree(cp_shape):  # type: ignore
+        def shapefree(cp_shape: ffi.CData) -> None:
             _logger.debug("shapefree start %s", cp_shape)
             cp_space = cp.cpShapeGetSpace(cp_shape)
             if cp_space != ffi.NULL:

pymunk/space.py

@@ -99,7 +99,7 @@ def __init__(self, threaded: bool = False) -> None:
             cp_space = cp.cpSpaceNew()
             freefunc = cp.cpSpaceFree
 
-        def spacefree(cp_space):  # type: ignore
+        def spacefree(cp_space: ffi.CData) -> None:
             _logger.debug("spacefree start %s", cp_space)
 
             cp_shapes: List[Shape] = []
@@ -716,7 +716,7 @@ def add_post_step_callback(
         if key in self._post_step_callbacks:
             return False
 
-        def f(x):  # type: ignore
+        def f(x: "Space") -> None:
             callback_function(self, key, *args, **kwargs)
 
         self._post_step_callbacks[key] = f

pymunk/tests/test_space.py

@@ -702,7 +702,7 @@ def testRemoveInSeparateWithoutStep(self) -> None:
 
         s.add(shape1, shape2, body2)
 
-        def separate(*_):
+        def separate(*_: Any) -> None:
             pass
 
         s.step(1)
@@ -732,11 +732,11 @@ def testCollisionHandlerRemoveAfterSeparate(self) -> None:
         space.add(shape1, body2, shape2, shape3, body3)
         print("START", shape1, shape2, shape3)
 
-        def separate(arbiter: p.Arbiter, space: p.Space, data):
+        def separate(arbiter: p.Arbiter, space: p.Space, data: Any) -> None:
             print("SEP", arbiter.shapes)
             self.separate_occurred = True
 
-        def post_solve(arbiter: p.Arbiter, space: p.Space, data):
+        def post_solve(arbiter: p.Arbiter, space: p.Space, data: Any) -> None:
             print("POST", arbiter.shapes)
             if self.separate_occurred:
                 print("POST REMOVE", arbiter.shapes)

pymunk/vec2d.py

@@ -72,7 +72,7 @@ def __repr__(self) -> str:
         return "Vec2d(%s, %s)" % (self.x, self.y)
 
     # Addition
-    def __add__(self, other: Tuple[float, float]) -> "Vec2d":  # type: ignore
+    def __add__(self, other: Tuple[float, float]) -> "Vec2d":  # type: ignore[override]
         """Add a Vec2d with another Vec2d or Tuple of size 2
 
         >>> Vec2d(3,4) + Vec2d(1,2)

setup.py

@@ -1,6 +1,6 @@
 import os
 
-from setuptools import setup  # type: ignore
+from setuptools import setup
 
 packages = ["pymunk", "pymunk.tests", "pymunk.examples"]
 exclude_package_data = {}