private-attribute-cpp 2.1.0__tar.gz → 2.1.1__tar.gz

{private_attribute_cpp-2.1.0/private_attribute_cpp.egg-info → private_attribute_cpp-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.0
+Version: 2.1.1
 Summary: A Python package that provides a way to define private attributes in C++ implementation.
 Home-page: https://github.com/Locked-chess-official/private_attribute_cpp
 Author: HuangHaoHua

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.1}/private_attribute.cpp

@@ -178,11 +178,7 @@ namespace {
         };
         static std::unordered_map<uintptr_t, std::unordered_map<uintptr_t, PyCodeObject*>> type_allowed_code_map;
         static std::unordered_map<uintptr_t, std::shared_ptr<std::shared_mutex>> all_type_mutex;
-        // private_func per type, stored with RAII ownership (PyObjectStorage
-        // INCREFs on assignment and DECREFs on destruction), so the map entry
-        // always owns exactly one reference - no dangling-pointer risk when the
-        // last external reference to the function disappears.
-        static std::unordered_map<uintptr_t, PyObjectStorage> type_need_call;
+        static std::unordered_map<uintptr_t, PyObject*> type_need_call;
         static std::unordered_map<uintptr_t, std::unordered_set<TwoStringTuple>> all_type_attr_set;
         namespace {
             static std::unordered_map<uintptr_t, std::unordered_map<uintptr_t,
@@ -1623,6 +1619,21 @@ PrivateAttr_tp_clear(PyObject* self) noexcept
     return 0;
 }
 
+// get_type_need_tp_* : the metaclass counterparts of get_need_tp_*.
+// get_need_tp_*          -> find the original slots of *types created by* the
+//                            metaclasses (wrapped with the instance-level
+//                            PrivateAttr_tp_* / PrivateAttr_tp_getattro set).
+// get_type_need_tp_*     -> find the original slots of the *metaclasses*
+//                            themselves (wrapped with the metaclass-level
+//                            PrivateAttrType_getattr / PrivateAttrType_setattr /
+//                            register_finalize / PrivateAttrType_tp_traverse /
+//                            PrivateAttrType_tp_clear).
+static getattrofunc get_type_need_tp_getattro(PyTypeObject* cls) noexcept;
+static setattrofunc get_type_need_tp_setattro(PyTypeObject* cls) noexcept;
+static traverseproc get_type_need_tp_traverse(PyTypeObject* cls) noexcept;
+static inquiry get_type_need_tp_clear(PyTypeObject* cls) noexcept;
+static destructor get_type_need_tp_finalize(PyTypeObject* cls) noexcept;
+
 // metaclass-level (type object) traverse/clear: call original if any, and handle AllData-stored type attributes
 static int
 PrivateAttrType_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept
@@ -1644,7 +1655,7 @@ PrivateAttrType_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept
             if (res) return res;
         }
     } else {
-        traverseproc orig = get_need_tp_traverse(typ);
+        traverseproc orig = get_type_need_tp_traverse(typ);
         if (orig) {
             int res = orig(self, visit, arg);
             if (res) return res;
@@ -1731,7 +1742,7 @@ PrivateAttrType_tp_clear(PyObject* self) noexcept
         inquiry orig = ::AllData::all_type_clear[typ_id];
         if (orig) orig(self);
     } else {
-        inquiry orig = get_need_tp_clear(typ);
+        inquiry orig = get_type_need_tp_clear(typ);
         if (orig) orig(self);
     }
 
@@ -1815,8 +1826,8 @@ static PyTypeObject PrivateAttrType = {
     0,                                          // tp_as_buffer
     Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,   // tp_flags
     "metaclass for private attributes",         // tp_doc
-    0,                                          // tp_travers
-    0,                                          // tp_clear
+    (traverseproc)PrivateAttrType_tp_traverse,  // tp_travers
+    (inquiry)PrivateAttrType_tp_clear,          // tp_clear
     0,                                          // tp_richcompare
     0,                                          // tp_weaklistoffset
     0,                                          // tp_iter
@@ -2505,21 +2516,6 @@ static traverseproc get_need_tp_traverse(PyTypeObject* cls) noexcept;
 static inquiry get_need_tp_clear(PyTypeObject* cls) noexcept;
 static destructor get_need_tp_finalize(PyTypeObject* cls) noexcept;
 
-// get_type_need_tp_* : the metaclass counterparts of get_need_tp_*.
-// get_need_tp_*          -> find the original slots of *types created by* the
-//                            metaclasses (wrapped with the instance-level
-//                            PrivateAttr_tp_* / PrivateAttr_tp_getattro set).
-// get_type_need_tp_*     -> find the original slots of the *metaclasses*
-//                            themselves (wrapped with the metaclass-level
-//                            PrivateAttrType_getattr / PrivateAttrType_setattr /
-//                            register_finalize / PrivateAttrType_tp_traverse /
-//                            PrivateAttrType_tp_clear).
-static getattrofunc get_type_need_tp_getattro(PyTypeObject* cls) noexcept;
-static setattrofunc get_type_need_tp_setattro(PyTypeObject* cls) noexcept;
-static traverseproc get_type_need_tp_traverse(PyTypeObject* cls) noexcept;
-static inquiry get_type_need_tp_clear(PyTypeObject* cls) noexcept;
-static destructor get_type_need_tp_finalize(PyTypeObject* cls) noexcept;
-
 // instance-level traverse/clear for types that use private attributes
 static int PrivateAttr_tp_traverse(PyObject* self, visitproc visit, void* arg) noexcept;
 static int PrivateAttr_tp_clear(PyObject* self) noexcept;
@@ -2739,10 +2735,7 @@ PrivateAttrType_postprocess(PyObject* new_type, PrivateAttrCreationData& data) n
     }
 
     if (data.private_func) {
-        // PyObjectStorage::operator=(PyObject*) takes its own reference here;
-        // data's reference is released by PrivateAttrCreationData::clear()
-        // right after this, and the map entry's reference is released when the
-        // entry is erased in PrivateAttrType_finalize.
+        Py_INCREF(data.private_func);
         ::AllData::type_need_call[type_id] = data.private_func;
     }
 
@@ -3231,7 +3224,7 @@ PrivateAttrType_finalize(PyObject* cls) noexcept
         ::AllData::type_allowed_code_map.erase(typ_id);
     }
     if (::AllData::type_need_call.find(typ_id) != ::AllData::type_need_call.end()) {
-        // erase() destroys the PyObjectStorage, which DECREFs private_func.
+        Py_DECREF(::AllData::type_need_call[typ_id]);
         ::AllData::type_need_call.erase(typ_id);
     }
     if (::AllData::type_attr_dict.find(typ_id) != ::AllData::type_attr_dict.end()) {

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.1/private_attribute_cpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.0
+Version: 2.1.1
 Summary: A Python package that provides a way to define private attributes in C++ implementation.
 Home-page: https://github.com/Locked-chess-official/private_attribute_cpp
 Author: HuangHaoHua

{private_attribute_cpp-2.1.0 → private_attribute_cpp-2.1.1}/setup.py

@@ -18,7 +18,7 @@ readme = open('README.md').read()
 
 setup(
     name='private_attribute_cpp',
-    version='2.1.0',
+    version='2.1.1',
     author="HuangHaoHua",
     author_email="13140752715@example.com",
     description='A Python package that provides a way to define private attributes in C++ implementation.',