Remove debug logging

Author: viblo

CHANGELOG.rst

@@ -2,21 +2,30 @@
 Changelog 
 =========
 
-.. Pymunk 6.12?????
-   Changes....
+Pymunk 6.11.1 (2025-02-09)
+--------------------------
+
+**Python 3.13 GC issue fix**
+
+This is a patch update to Pymunk that removes debug logging. This should an 
+issue with GC on Python 3.13.
+
+Changes:
+ - Remove debug logging
+
 
 Pymunk 6.11.0 (2025-01-18)
 --------------------------
 
 **Debug draw for Pyglet 2.1**
 
-This is a minor update to Pymunk that update the pyglet debug draw code to 
+This is a minor update to Pymunk that update the Pyglet debug draw code to 
 work with the newly released Pyglet 2.1. Note that this means Pyglet 2.0.x 
 does not work anymore. The release also adds back pre-built wheels for Pypy 
 with a workaround until Pypy make a new release.
 
 Changes:
-  - Support pyglet 2.1.x (this means Pyglet 2.0.x wont work)
+  - Support Pyglet 2.1.x (this means Pyglet 2.0.x wont work)
   - Readded Pypy pre-built wheels
 
 

pymunk/_callbacks.py

@@ -299,7 +299,6 @@ def ext_cpBodyArbiterIteratorFunc(
 def ext_cpBodyConstraintIteratorFunc(
     cp_body: ffi.CData, cp_constraint: ffi.CData, _: ffi.CData
 ) -> None:
-    _logger.debug("bodyfree remove constraint %s %s", cp_body, cp_constraint)
     cp_space = lib.cpConstraintGetSpace(cp_constraint)
     if cp_space != ffi.NULL:
         lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
@@ -309,7 +308,6 @@ def ext_cpBodyConstraintIteratorFunc(
 def ext_cpBodyShapeIteratorFunc(
     cp_body: ffi.CData, cp_shape: ffi.CData, _: ffi.CData
 ) -> None:
-    _logger.debug("bodyfree remove shape %s %s", cp_body, cp_shape)
     cp_space = lib.cpShapeGetSpace(cp_shape)
     if cp_space != ffi.NULL:
         lib.cpSpaceRemoveShape(cp_space, cp_shape)

pymunk/body.py

@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 from typing import (  # Literal,
     TYPE_CHECKING,
     Any,
@@ -31,8 +30,6 @@
 _PositionFunc = Callable[["Body", float], None]
 _VelocityFunc = Callable[["Body", Vec2d, float, float], None]
 
-_logger = logging.getLogger(__name__)
-
 
 class Body(PickleMixin, TypingAttrMixing, object):
     """A rigid body
@@ -199,8 +196,6 @@ def __init__(
         """
 
         def freebody(cp_body: ffi.CData) -> None:
-            _logger.debug("bodyfree start %s", cp_body)
-
             # remove all shapes on this body from the space
             lib.cpBodyEachShape(cp_body, lib.ext_cpBodyShapeIteratorFunc, ffi.NULL)
 
@@ -210,13 +205,9 @@ def freebody(cp_body: ffi.CData) -> None:
             )
 
             cp_space = lib.cpBodyGetSpace(cp_body)
-            _logger.debug("bodyfree space %s", cp_space)
             # print(cp_space, cp_space == ffi.NULL)
             if cp_space != ffi.NULL:
-                _logger.debug("bodyfree space remove body %s %s", cp_space, cp_body)
                 lib.cpSpaceRemoveBody(cp_space, cp_body)
-
-            _logger.debug("bodyfree free %s", cp_body)
             lib.cpBodyFree(cp_body)
 
         if body_type == Body.DYNAMIC:

pymunk/constraints.py

@@ -68,7 +68,6 @@
     "SimpleMotor",
 ]
 
-import logging
 from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, Tuple, Union
 
 if TYPE_CHECKING:
@@ -80,8 +79,6 @@
 from ._typing_attr import TypingAttrMixing
 from .vec2d import Vec2d
 
-_logger = logging.getLogger(__name__)
-
 _TorqueFunc = Callable[["DampedRotarySpring", float], float]
 _ForceFunc = Callable[["DampedSpring", float], float]
 
@@ -114,7 +111,6 @@ def constraintfree(cp_constraint: ffi.CData) -> None:
             if cp_space != ffi.NULL:
                 lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
 
-            _logger.debug("constraintfree %s", cp_constraint)
             lib.cpConstraintFree(cp_constraint)
 
         self._constraint = ffi.gc(_constraint, constraintfree)
@@ -453,7 +449,7 @@ def __init__(
         b: "Body",
         *args: Union[
             Tuple[float, float], Tuple[Tuple[float, float], Tuple[float, float]]
-        ]
+        ],
     ) -> None:
         """a and b are the two bodies to connect, and pivot is the point in
         world coordinates of the pivot.

pymunk/shapes.py

@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 from typing import TYPE_CHECKING, List, Optional, Sequence, Tuple
 
 if TYPE_CHECKING:
@@ -18,8 +17,6 @@
 from .transform import Transform
 from .vec2d import Vec2d
 
-_logger = logging.getLogger(__name__)
-
 
 class Shape(PickleMixin, TypingAttrMixing, object):
     """Base class for all the shapes.
@@ -59,19 +56,13 @@ def _init(self, body: Optional["Body"], _shape: ffi.CData) -> None:
             body._shapes.add(self)
 
         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:
-                _logger.debug("shapefree remove from space %s %s", cp_space, cp_shape)
                 cp.cpSpaceRemoveShape(cp_space, cp_shape)
 
-            _logger.debug("shapefree get body %s", cp_shape)
             cp_body = cp.cpShapeGetBody(cp_shape)
             if cp_body != ffi.NULL:
-                _logger.debug("shapefree set body %s", cp_shape)
-                # print(cp.cpShapeActive2(cp_shape))
                 cp.cpShapeSetBody(cp_shape, ffi.NULL)
-            _logger.debug("shapefree free %s", cp_shape)
             cp.cpShapeFree(cp_shape)
 
         self._shape = ffi.gc(_shape, shapefree)

pymunk/space.py

@@ -1,6 +1,5 @@
 __docformat__ = "reStructuredText"
 
-import logging
 import platform
 import weakref
 from typing import (
@@ -39,8 +38,6 @@
 
 _AddableObjects = Union[Body, Shape, Constraint]
 
-_logger = logging.getLogger(__name__)
-
 
 class Space(PickleMixin, object):
     """Spaces are the basic unit of simulation. You add rigid bodies, shapes
@@ -100,15 +97,12 @@ def __init__(self, threaded: bool = False) -> None:
             freefunc = cp.cpSpaceFree
 
         def spacefree(cp_space: ffi.CData) -> None:
-            _logger.debug("spacefree start %s", cp_space)
-
             cp_shapes: List[Shape] = []
             cp_shapes_h = ffi.new_handle(cp_shapes)
             cp.cpSpaceEachShape(cp_space, lib.ext_cpSpaceShapeIteratorFunc, cp_shapes_h)
 
             for cp_shape in cp_shapes:
                 cp_space = lib.cpShapeGetSpace(cp_shape)
-                _logger.debug("spacefree remove shape %s %s", cp_space, cp_shape)
 
                 lib.cpSpaceRemoveShape(cp_space, cp_shape)
                 lib.cpShapeSetBody(cp_shape, ffi.NULL)
@@ -120,27 +114,22 @@ def spacefree(cp_space: ffi.CData) -> None:
             )
             for cp_constraint in cp_constraints:
                 cp_space = lib.cpConstraintGetSpace(cp_constraint)
-                _logger.debug(
-                    "spacefree remove constraint %s %s", cp_space, cp_constraint
-                )
                 lib.cpSpaceRemoveConstraint(cp_space, cp_constraint)
 
             cp_bodys: List[Body] = []
             cp_bodys_h = ffi.new_handle(cp_bodys)
             cp.cpSpaceEachBody(cp_space, lib.ext_cpSpaceBodyIteratorFunc, cp_bodys_h)
             for cp_body in cp_bodys:
                 cp_space = lib.cpBodyGetSpace(cp_body)
-                _logger.debug("spacefree remove body %s %s", cp_space, cp_body)
                 lib.cpSpaceRemoveBody(cp_space, cp_body)
 
-            _logger.debug("spacefree free %s", cp_space)
             freefunc(cp_space)
 
         self._space = ffi.gc(cp_space, spacefree)
 
-        self._handlers: Dict[
-            Any, CollisionHandler
-        ] = {}  # To prevent the gc to collect the callbacks.
+        self._handlers: Dict[Any, CollisionHandler] = (
+            {}
+        )  # To prevent the gc to collect the callbacks.
 
         self._post_step_callbacks: Dict[Any, Callable[["Space"], None]] = {}
         self._removed_shapes: Dict[int, Shape] = {}

pymunk/tests/__init__.py

@@ -65,7 +65,7 @@ def run_tests(filter: str = "", with_dependencies: List[str] = []) -> bool:
         )
     except:
         pass
-    print("")
+    print()
 
     def list_of_tests_gen(s: Any) -> Iterator[Any]:
         for test in s:

pymunk/tests/test_batch.py

@@ -214,7 +214,6 @@ def check_arb_data(arb: pymunk.Arbiter) -> None:
                 # When using each_arbiter a mirror of each arbiter will be
                 # returned as well. These we ignore.
                 return
-            # print(a_id, b_id, idx, arb.total_impulse)
             # Assert int values
             self.assertEqual(arb.is_first_contact, ints[idx * 4 + 2])
             self.assertEqual(len(arb.contact_point_set.points), ints[idx * 4 + 3])

pymunk/tests/test_common.py

@@ -108,28 +108,28 @@ def testNoStaticShape(self) -> None:
         b3.position = -9, 0
 
         space.add(b1, c1, b2, c2, b3, c3)
-        print("\nc1", c1)
+        # print("\nc1", c1)
 
         def remove_first(arbiter: p.Arbiter, space: p.Space, data: Any) -> None:
-            print("SEP 1", arbiter.shapes)
-            print("  space.shapes", space.shapes)
-            print("  space._remove_later", space._remove_later)
+            # print("SEP 1", arbiter.shapes)
+            # print("  space.shapes", space.shapes)
+            # print("  space._remove_later", space._remove_later)
             first_shape = arbiter.shapes[0]
             if c1 in space.shapes:
                 space.remove(c1)
-                print("  space.shapes", space.shapes)
-                print("  space._remove_later", space._remove_later)
-            print("SEP done")
+            #     print("  space.shapes", space.shapes)
+            #     print("  space._remove_later", space._remove_later)
+            # print("SEP done")
             # space.add_post_step_callback(space.remove, first_shape, first_shape.body)
             # space.remove(c1)
 
         space.add_collision_handler(2, 0).separate = remove_first
-        print(1)
+        # print(1)
         space.step(1.0 / 60)
-        print(2)
+        # print(2)
         b2.position = 22, 0
         space.step(1.0 / 60)
-        print(3)
+        # print(3)
 
     def testX(self) -> None:
         space = p.Space()
@@ -149,24 +149,24 @@ def testX(self) -> None:
         # b3.position = -9, 0
 
         space.add(b1, c1, b2, c2, b3, c3)
-        print("\nc1", c1)
+        # print("\nc1", c1)
 
         def separate(arbiter: p.Arbiter, space: p.Space, data: Any) -> None:
-            print("SEP 1", arbiter.shapes)
-            print("  space.shapes", space.shapes)
-            print("  space._remove_later", space._remove_later)
+            # print("SEP 1", arbiter.shapes)
+            # print("  space.shapes", space.shapes)
+            # print("  space._remove_later", space._remove_later)
             if c1 in space.shapes:
                 space.remove(c1)
-                print("  space.shapes", space.shapes)
-                print("  space._remove_later", space._remove_later)
-            print("SEP done")
+            #     print("  space.shapes", space.shapes)
+            #     print("  space._remove_later", space._remove_later)
+            # print("SEP done")
             # space.add_post_step_callback(space.remove, first_shape, first_shape.body)
             # space.remove(c1)
 
         space.add_collision_handler(2, 0).separate = separate
-        print(1)
+        # print(1)
         space.step(1)
-        print(2)
+        # print(2)
         b2.position = 22, 0
         space.step(1)
-        print(3)
+        # print(3)