x

Author: youknowone

crates/derive-impl/src/pyclass.rs

@@ -582,10 +582,17 @@ pub(crate) fn impl_pyclass(attr: PunctuatedNestedMeta, item: Item) -> Result<Tok
     // 3. `traverse`: IS_TRACE = true, and #[derive(Traverse)]
     //
     // For clear (tp_clear):
-    // 1. no `clear`: HAS_CLEAR = false, try_clear does nothing
-    // 2. `clear`: HAS_CLEAR = true, try_clear calls Traverse::clear
+    // 1. no `clear`: HAS_CLEAR = IS_TRACE (default: same as traverse)
+    // 2. `clear` or `clear = true`: HAS_CLEAR = true, try_clear calls Traverse::clear
+    // 3. `clear = false`: HAS_CLEAR = false (rare: traverse without clear)
     let has_traverse = class_meta.inner()._has_key("traverse")?;
-    let has_clear = class_meta.inner()._has_key("clear")?;
+    let has_clear = if class_meta.inner()._has_key("clear")? {
+        // If clear attribute is present, use its value
+        class_meta.inner()._bool("clear")?
+    } else {
+        // If clear attribute is absent, default to same as traverse
+        has_traverse
+    };
 
     let derive_trace = if has_traverse {
         // _optional_str returns Err when key exists without value (e.g., `traverse` vs `traverse = "manual"`)

crates/vm/src/builtins/dict.rs

@@ -30,13 +30,7 @@ use std::sync::LazyLock;
 
 pub type DictContentType = dict_inner::Dict;
 
-#[pyclass(
-    module = false,
-    name = "dict",
-    unhashable = true,
-    traverse = "manual",
-    clear  // tp_clear
-)]
+#[pyclass(module = false, name = "dict", unhashable = true, traverse = "manual")]
 #[derive(Default)]
 pub struct PyDict {
     entries: DictContentType,

crates/vm/src/builtins/function.rs

@@ -25,7 +25,7 @@ use itertools::Itertools;
 #[cfg(feature = "jit")]
 use rustpython_jit::CompiledCode;
 
-#[pyclass(module = false, name = "function", traverse = "manual", clear)] // tp_clear
+#[pyclass(module = false, name = "function", traverse = "manual")]
 #[derive(Debug)]
 pub struct PyFunction {
     code: PyMutex<PyRef<PyCode>>,

crates/vm/src/builtins/list.rs

@@ -24,13 +24,7 @@ use crate::{
 use alloc::fmt;
 use core::ops::DerefMut;
 
-#[pyclass(
-    module = false,
-    name = "list",
-    unhashable = true,
-    traverse = "manual",
-    clear  // tp_clear
-)]
+#[pyclass(module = false, name = "list", unhashable = true, traverse = "manual")]
 #[derive(Default)]
 pub struct PyList {
     elements: PyRwLock<Vec<PyObjectRef>>,

crates/vm/src/builtins/tuple.rs

@@ -25,7 +25,7 @@ use crate::{
 use alloc::fmt;
 use std::sync::LazyLock;
 
-#[pyclass(module = false, name = "tuple", traverse = "manual", clear)] // tp_clear
+#[pyclass(module = false, name = "tuple", traverse = "manual")]
 pub struct PyTuple<R = PyObjectRef> {
     elements: Box<[R]>,
 }