private-attribute-cpp 2.1.9__tar.gz → 2.1.11__tar.gz

{private_attribute_cpp-2.1.9/private_attribute_cpp.egg-info → private_attribute_cpp-2.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.9
+Version: 2.1.11
 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.9 → private_attribute_cpp-2.1.11}/private_attribute.cpp

@@ -1802,11 +1802,14 @@ PrivateAttr_tp_clear(PyObject* self) noexcept
 
 class KeepPythonException {
 private:
-    PyObject* typ;
-    PyObject* exc;
-    PyObject* tb;
+#if PY_VERSION_HEX < 0x030C0000
+    PyObject* typ = NULL;
+    PyObject* tb = NULL;
+#endif
+    PyObject* exc = NULL;
 public:
     KeepPythonException() noexcept {
+        if (PyErr_Occurred())
         // under 3.12 use PyErr_Fetch
 #if PY_VERSION_HEX < 0x030C0000
         PyErr_Fetch(&typ, &exc, &tb);
@@ -1816,6 +1819,7 @@ public:
     }
 
     ~KeepPythonException() noexcept {
+        if (exc)
         // under 3.12 use PyErr_Restore
 #if PY_VERSION_HEX < 0x030C0000
         PyErr_Restore(typ, exc, tb);
@@ -2407,9 +2411,12 @@ analyse_all_code(PyObject* obj, std::unordered_map<uintptr_t, PyObjectStorage>&
 static std::string
 real_class_name(const std::string& name, const std::string& class_name) noexcept
 {
+    size_t start_pos = class_name.find_first_not_of('_');
+    std::string cleaned_class_name = (start_pos == std::string::npos) ? "" : class_name.substr(start_pos);
+
     // if the name starts with "__" but does not end with "__", change to _ClassName__name
     if (name.length() >= 2 && name.substr(0, 2) == "__" && name.substr(name.length() - 2) != "__") {
-        return "_" + class_name + name;
+        return "_" + cleaned_class_name + name;
     }
     return name;
 }
@@ -2885,9 +2892,22 @@ ensure_tp(PyTypeObject* type_instance) noexcept
 static void
 ensure_subclass_tp(PyTypeObject* type_instance) noexcept
 {
+    KeepPythonException _;
     PyObject* subclasses = PyObject_CallMethod((PyObject*)&PyType_Type, "__subclasses__", "O", (PyObject*)type_instance);
-    assert(subclasses);
-    assert(PyList_Check(subclasses));
+    if (!subclasses) {
+        PyObject* unraisable_missing = PyUnicode_FromString("type.__subclasses__()");
+        PyErr_WriteUnraisable(unraisable_missing);
+        Py_DECREF(unraisable_missing);
+        return;
+    }
+    if (!PyList_Check(subclasses)) {
+        PyErr_SetString(PyExc_TypeError, "type.__subclasses__() did not return a list");
+        PyObject* unraisable_missing = PyUnicode_FromString("type.__subclasses__()");
+        PyErr_WriteUnraisable(unraisable_missing);
+        Py_DECREF(unraisable_missing);
+        Py_DECREF(subclasses);
+        return;
+    }
     Py_ssize_t list_len = PyList_GET_SIZE(subclasses);
     for (Py_ssize_t i = 0; i < list_len; i++) {
         PyObject* subclass = PyList_GetItem(subclasses, i);
@@ -4271,36 +4291,20 @@ atexit_register_clean_func(void) noexcept
     if (!atexit) {
         return -1;
     }
-    PyObject* register_func = PyObject_GetAttrString(atexit, "register");
-    if (!register_func) {
-        Py_DECREF(atexit);
-        return -1;
-    }
 
     PyObject* func = PyCFunction_New(&clean_storage, NULL);
     if (!func) {
-        Py_DECREF(register_func);
-        Py_DECREF(atexit);
-        return -1;
-    }
-    PyObject* args = PyTuple_New(1);
-    if (!args) {
-        Py_DECREF(func);
-        Py_DECREF(register_func);
         Py_DECREF(atexit);
         return -1;
     }
-    PyTuple_SET_ITEM(args, 0, func);
-    PyObject* result = PyObject_CallObject(register_func, args);
-    if (result == NULL) {
-        Py_DECREF(args);
-        Py_DECREF(register_func);
-        Py_DECREF(atexit);
+
+    PyObject* result = PyObject_CallMethod(atexit, "register", "O", func);
+    Py_DECREF(func);
+    Py_DECREF(atexit);
+
+    if (!result) {
         return -1;
     }
-    Py_DECREF(args);
-    Py_DECREF(register_func);
-    Py_DECREF(atexit);
     Py_DECREF(result);
     return 0;
 }

{private_attribute_cpp-2.1.9 → private_attribute_cpp-2.1.11/private_attribute_cpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.9
+Version: 2.1.11
 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.9 → private_attribute_cpp-2.1.11}/setup.py

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