private-attribute-cpp 2.1.16__tar.gz → 2.1.18__tar.gz

{private_attribute_cpp-2.1.16/private_attribute_cpp.egg-info → private_attribute_cpp-2.1.18}/PKG-INFO

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

@@ -1120,41 +1120,67 @@ PrivateWrap_descrset(PyObject* obj, PyObject* name, PyObject* value) noexcept
     }
 }
 
+static int
+PrivateWrap_traverse(PyObject* obj, visitproc visit, void* arg) noexcept
+{
+    PrivateWrapObject* self = (PrivateWrapObject*)obj;
+    if (self->result) {
+        Py_VISIT(self->result);
+    }
+    if (self->func_list) {
+        Py_VISIT(self->func_list);
+    }
+    return 0;
+}
+
+static int
+PrivateWrap_clear(PyObject* obj) noexcept
+{
+    PrivateWrapObject* self = (PrivateWrapObject*)obj;
+    if (self->result) {
+        Py_CLEAR(self->result);
+    }
+    if (self->func_list) {
+        Py_CLEAR(self->func_list);
+    }
+    return 0;
+}
+
 static PyTypeObject PrivateWrapType = {
     PyVarObject_HEAD_INIT(NULL, 0)
-    "_PrivateWrap",                    // tp_name
-    sizeof(PrivateWrapObject),         // tp_basicsize
-    0,                                 // tp_itemsize
-    (destructor)PrivateWrap_dealloc,   // tp_dealloc
-    0,                                 // tp_print
-    0,                                 // tp_getattr
-    0,                                 // tp_setattr
-    0,                                 // tp_reserved
-    0,                                 // tp_repr
-    0,                                 // tp_as_number
-    0,                                 // tp_as_sequence
-    0,                                 // tp_as_mapping
-    0,                                 // tp_hash
-    (ternaryfunc)PrivateWrap_call,     // tp_call
-    0,                                 // tp_str
-    PrivateWrap_getattro,              // tp_getattro
-    0,                                 // tp_setattro
-    0,                                 // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                // tp_flags
-    "private_attribute._PrivateWrap",  // tp_doc
-    0,                                 // tp_traverse
-    0,                                 // tp_clear
-    0,                                 // tp_richcompare
-    0,                                 // tp_weaklistoffset
-    0,                                 // tp_iter
-    0,                                 // tp_iternext
-    0,                                 // tp_methods
-    PrivateWrap_members,               // tp_members
-    PrivateWrap_getset,                // tp_getset
-    0,                                 // tp_base
-    0,                                 // tp_dict
-    PrivateWrap_descrget,              // tp_descr_get
-    PrivateWrap_descrset,              // tp_descr_set
+    "_PrivateWrap",                            // tp_name
+    sizeof(PrivateWrapObject),                 // tp_basicsize
+    0,                                         // tp_itemsize
+    (destructor)PrivateWrap_dealloc,           // tp_dealloc
+    0,                                         // tp_print
+    0,                                         // tp_getattr
+    0,                                         // tp_setattr
+    0,                                         // tp_reserved
+    0,                                         // tp_repr
+    0,                                         // tp_as_number
+    0,                                         // tp_as_sequence
+    0,                                         // tp_as_mapping
+    0,                                         // tp_hash
+    (ternaryfunc)PrivateWrap_call,             // tp_call
+    0,                                         // tp_str
+    PrivateWrap_getattro,                      // tp_getattro
+    0,                                         // tp_setattro
+    0,                                         // tp_as_buffer
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,   // tp_flags
+    "private_attribute._PrivateWrap",          // tp_doc
+    PrivateWrap_traverse,                      // tp_traverse
+    PrivateWrap_clear,                         // tp_clear
+    0,                                         // tp_richcompare
+    0,                                         // tp_weaklistoffset
+    0,                                         // tp_iter
+    0,                                         // tp_iternext
+    0,                                         // tp_methods
+    PrivateWrap_members,                       // tp_members
+    PrivateWrap_getset,                        // tp_getset
+    0,                                         // tp_base
+    0,                                         // tp_dict
+    PrivateWrap_descrget,                      // tp_descr_get
+    PrivateWrap_descrset,                      // tp_descr_set
 };
 
 static PrivateWrapObject*
@@ -1171,7 +1197,7 @@ PrivateWrap_New(PyObject *decorator, PyObject *func, PyObject *list) noexcept
     }
 
     PrivateWrapObject *self =
-        PyObject_New(PrivateWrapObject, &PrivateWrapType);
+        PyObject_GC_New(PrivateWrapObject, &PrivateWrapType);
     self->func_list = list;
     Py_INCREF(list);
 
@@ -1207,7 +1233,7 @@ static PyObject*
 PrivateWrapProxy_call(PrivateWrapProxyObject *self, PyObject *args, PyObject* /* kwgs */) noexcept
 {
     PyObject *func;
-    if (!PyArg_ParseTuple(args, "O", &func)) return NULL;
+    if (!PyArg_ParseTuple(args, "O:private_attribute.PrivateWrapProxy.__call__", &func)) return NULL;
     if(PyObject_TypeCheck(func, &PrivateWrapType)) {
         return (PyObject*)PrivateWrap_New(
             self->decorator,
@@ -1262,6 +1288,22 @@ class MyClass(PrivateAttrBase):
 ```
 )";
 
+static int
+PrivateWrapProxy_traverse(PrivateWrapProxyObject *self, visitproc visit, void *arg) noexcept
+{
+    Py_VISIT(self->decorator);
+    Py_VISIT(self->func_list);
+    return 0;
+}
+
+static int
+PrivateWrapProxy_clear(PrivateWrapProxyObject *self) noexcept
+{
+    Py_CLEAR(self->decorator);
+    Py_CLEAR(self->func_list);
+    return 0;
+}
+
 static PyTypeObject PrivateWrapProxyType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "private_attribute.PrivateWrapProxy",   // tp_name
@@ -1282,10 +1324,10 @@ static PyTypeObject PrivateWrapProxyType = {
     0,                                      // tp_getattro
     0,                                      // tp_setattro
     0,                                      // tp_as_buffer
-    Py_TPFLAGS_DEFAULT,                     // tp_flags
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC,// tp_flags
     PrivateWrapProxy_doc,                   // tp_doc
-    0,                                      // tp_traverse
-    0,                                      // tp_clear
+    (traverseproc)PrivateWrapProxy_traverse,// tp_traverse
+    (inquiry)PrivateWrapProxy_clear,        // tp_clear
     0,                                      // tp_richcompare
     0,                                      // tp_weaklistoffset
     0,                                      // tp_iter
@@ -1310,7 +1352,7 @@ PrivateWrapProxy_New(PyTypeObject *type, PyObject *args, PyObject* /*kwds*/) noe
     PyObject *decorator;
     PyObject *orig = NULL;
 
-    if (!PyArg_ParseTuple(args, "O|O", &decorator, &orig))
+    if (!PyArg_ParseTuple(args, "O|O:private_attribute.PrivateWrapProxy", &decorator, &orig))
         return NULL;
 
     self = (PrivateWrapProxyObject*)type->tp_alloc(type, 0);
@@ -2522,7 +2564,7 @@ need_analyse_type(PyObject* type) noexcept
 }
 
 static bool
-PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationData& data) noexcept
+PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationData& data, const std::string& func_name = "") noexcept
 {
     static const char* invalid_name[] = {"__private_attrs__", "__slots__", "__getattribute__", "__getattr__", "__init__",
         "__setattr__", "__delattr__", "__name__", "__module__", "__doc__", "__getstate__", "__setstate__",
@@ -2534,7 +2576,11 @@ PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationDa
     }
 
     // only parse name, bases, attrs
-    if (!PyArg_ParseTuple(args, "OOO", &data.name, &data.bases, &data.attrs)) {
+    std::string parse = "OOO";
+    if (func_name.length() > 0) {
+        parse += ":" + func_name;
+    }
+    if (!PyArg_ParseTuple(args, parse.c_str(), &data.name, &data.bases, &data.attrs)) {
         return false;
     }
     Py_INCREF(data.name);
@@ -3069,7 +3115,7 @@ PrivateAttrType_new(PyTypeObject* type, PyObject* args, PyObject* kwds) noexcept
     PrivateAttrCreationData data;
     PyObject* new_type = nullptr;
 
-    if (!PrivateAttrType_preprocess(args, kwds, data)) {
+    if (!PrivateAttrType_preprocess(args, kwds, data, "private_attribute.PrivateAttrType")) {
         return nullptr;
     }
 
@@ -3682,6 +3728,54 @@ PrivateTempObject_dealloc(PyObject* self) noexcept
     Py_TYPE(self)->tp_free(self);
 }
 
+static PyObject*
+PrivateTempObject_postprocess(PyObject* self, PyObject* type) noexcept
+{
+    if (!PyType_Check(type)) {
+        PyErr_SetString(PyExc_TypeError, "type must be a type");
+        return NULL;
+    }
+    if ((((PrivateTempObject*)self)->tmp->cleared)) {
+        PyErr_SetString(PyExc_RuntimeError, "temp not init or have been used");
+        return NULL;
+    }
+    if (!PrivateAttrType_postprocess(type, *(((PrivateTempObject*)self)->tmp))) {
+        return NULL;
+    }
+    ((PrivateTempObject*)self)->tmp->clear();
+    Py_RETURN_NONE;
+}
+
+static PyMethodDef PrivateTempObject_methods[] = {
+    {"postprocess", (PyCFunction)PrivateTempObject_postprocess, METH_O, "postprocess the temp object"},
+    {NULL}
+};
+
+static int
+PrivateTempObject_traverse(PyObject* self, visitproc visit, void* arg) noexcept
+{
+    PrivateTempObject* tmp = (PrivateTempObject*)self;
+    if (tmp->tmp) {
+        PrivateAttrCreationData* data = tmp->tmp;
+        if (!data->cleared) {
+            Py_VISIT(data->attrs_copy);
+            Py_VISIT(data->base_kwds);
+            Py_VISIT(data->attrs);
+        }
+    }
+    return 0;
+}
+
+static int
+PrivateTempObject_clear(PyObject* self) noexcept
+{
+    PrivateTempObject* tmp = (PrivateTempObject*)self;
+    if (tmp->tmp && !tmp->tmp->cleared) {
+        tmp->tmp->clear();
+    }
+    return 0;
+}
+
 static PyTypeObject PrivateTempType = {
     PyVarObject_HEAD_INIT(NULL, 0)
     "private_attribute._PrivateTemp",    // tp_name
@@ -3702,15 +3796,15 @@ static PyTypeObject PrivateTempType = {
     0, //tp_getattro
     0, //tp_setattro
     0, //tp_as_buffer
-    Py_TPFLAGS_DEFAULT, //tp_flags
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_HAVE_GC, //tp_flags
     0, //tp_doc
-    0, //tp_traverse
-    0, //tp_clear
+    PrivateTempObject_traverse, //tp_traverse
+    PrivateTempObject_clear, //tp_clear
     0, //tp_richcompare
     0, //tp_weaklistoffset
     0, //tp_iter
     0, //tp_iternext
-    0, //tp_methods
+    PrivateTempObject_methods, //tp_methods
     0, //tp_members
     PrivateTempObject_getsets //tp_getset
 };
@@ -3719,12 +3813,12 @@ static PyObject*
 prepare_for_PrivateAttr(PyObject* /*self*/, PyObject* args, PyObject* kwargs) noexcept
 {
     PrivateAttrCreationData* tmp_data = new PrivateAttrCreationData();
-    if (!PrivateAttrType_preprocess(args, kwargs, *tmp_data)) {
+    if (!PrivateAttrType_preprocess(args, kwargs, *tmp_data, "private_attribute.prepare")) {
         tmp_data->clear();
         delete tmp_data;
         return NULL;
     }
-    PrivateTempObject* tmp = PyObject_New(PrivateTempObject, &PrivateTempType);
+    PrivateTempObject* tmp = PyObject_GC_New(PrivateTempObject, &PrivateTempType);
     if (!tmp) {
         tmp_data->clear();
         delete tmp_data;
@@ -3742,19 +3836,7 @@ postprocess_for_PrivateAttr(PyObject* /*self*/, PyObject* args) noexcept
     if (!PyArg_ParseTuple(args, "OO", &type, &tmp)) {
         return NULL;
     }
-    if (!PyType_Check(type)) {
-        PyErr_SetString(PyExc_TypeError, "type must be a type");
-        return NULL;
-    }
-    if (!PyObject_TypeCheck(tmp, &PrivateTempType)) {
-        PyErr_SetString(PyExc_TypeError, "tmp must be a private_temp");
-        return NULL;
-    }
-    if (!PrivateAttrType_postprocess(type, *(((PrivateTempObject*)tmp)->tmp))) {
-        return NULL;
-    }
-    ((PrivateTempObject*)tmp)->tmp->clear();
-    Py_RETURN_NONE;
+    return PrivateTempObject_postprocess(tmp, type);
 }
 
 #define METACLASS_WEAKREF_CALLBACK_REMOVE_ITEM(name) do {\
@@ -4122,7 +4204,7 @@ class PrivateAbcMeta(ABCMeta):
     def __new__(cls, *args, **kwargs):
         temp = private_attribute.prepare(*args, **kwargs)
         typ = super().__new__(cls, temp.name, temp.bases, temp.attrs, **temp.kwds)
-        private_attribute.postprocess(typ, temp)
+        private_attribute.postprocess(typ, temp) # or temp.postprocess(typ)
         return typ
 
 private_attribute.register_metaclass(PrivateAbcMeta)

{private_attribute_cpp-2.1.16 → private_attribute_cpp-2.1.18}/private_attribute.pyi

@@ -1,6 +1,6 @@
 """A module that provides a metaclass for creating classes with private attributes.
-Private attributes are defined in the `__private_attrs__` sequence and are only
-You can use the `PrivateAttrBase` metaclass to create classes with private attributes.
+Private attributes are defined in the `__private_attrs__` sequence and are only visitable in class codes.
+You can use the `PrivateAttrBase` as the base class to create classes with private attributes.
 The attributes which are private are not on the instance's `__dict__` and cannot be accessed outside
 but in the methods defined in class it is reachable.
 Usage example:
@@ -105,6 +105,7 @@ class _PrivateTemp:
     def attrs(self) -> dict[str, Any]: ...
     @property
     def kwds(self) -> dict[str, Any]: ...
+    def postprocess(self, typ: type, /) -> None: ... # add in 2.1.17
 
 def prepare(name: str, bases: tuple, attrs: _PrivateAttrDict, /, **kwds) -> _PrivateTemp:
     """
@@ -129,7 +130,7 @@ def prepare(name: str, bases: tuple, attrs: _PrivateAttrDict, /, **kwds) -> _Pri
         def __new__(cls, *args, **kwargs):
             temp = private_attribute.prepare(*args, **kwargs)
             typ = super().__new__(cls, temp.name, temp.bases, temp.attrs, **temp.kwds)
-            private_attribute.postprocess(typ, temp)
+            private_attribute.postprocess(typ, temp) # or temp.postprocess(typ)
             return typ
 
     private_attribute.register_metaclass(PrivateAbcMeta)
@@ -160,7 +161,7 @@ def postprocess(typ: type, temp: _PrivateTemp, /) -> None:
         def __new__(cls, *args, **kwargs):
             temp = private_attribute.prepare(*args, **kwargs)
             typ = super().__new__(cls, temp.name, temp.bases, temp.attrs, **temp.kwds)
-            private_attribute.postprocess(typ, temp)
+            private_attribute.postprocess(typ, temp) # or temp.postprocess(typ)
             return typ
 
     private_attribute.register_metaclass(PrivateAbcMeta)
@@ -190,7 +191,7 @@ def register_metaclass(typ: type, /) -> None:
         def __new__(cls, *args, **kwargs):
             temp = private_attribute.prepare(*args, **kwargs)
             typ = super().__new__(cls, temp.name, temp.bases, temp.attrs, **temp.kwds)
-            private_attribute.postprocess(typ, temp)
+            private_attribute.postprocess(typ, temp) # or temp.postprocess(typ)
             return typ
 
     private_attribute.register_metaclass(PrivateAbcMeta)

{private_attribute_cpp-2.1.16 → private_attribute_cpp-2.1.18/private_attribute_cpp.egg-info}/PKG-INFO

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

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