private-attribute-cpp 2.1.3__tar.gz → 2.1.4__tar.gz

{private_attribute_cpp-2.1.3/private_attribute_cpp.egg-info → private_attribute_cpp-2.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.3
+Version: 2.1.4
 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
@@ -75,7 +75,7 @@ print(obj.expensive_api_call(10))   # works with all decorators applied
 | 1 | PrivateWrapProxy | Decorator wrapper for arbitrary decorators | When needed |
 | 2 | private_func=callable | Custom hidden-name generator | Optional |
 | 3 | Pass private_func in class definition | Same as above | Optional |
-| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Yes |
+| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Optional (changed in 2.1.4) |
 | 5 | @PrivateWrapProxy(...) | Make any decorator compatible with private attributes | When needed |
 | 6 | method.result.xxx chain + dummy wrap | Fix decorator order and name conflicts | When needed |
 
@@ -240,8 +240,8 @@ TypeError: Can't instantiate abstract class MyClass without an implementation fo
 
 ## Notes
 
-- All of the private attributes class must contain the `__private_attrs__` attribute.
-- The `__private_attrs__` attribute must be a sequence of strings.
+- ~~All of the private attributes class must contain the `__private_attrs__` attribute.~~(changed in 2.1.4)
+- The `__private_attrs__` attribute must be a sequence of strings or just one string.
 - You cannot define the name which in `__slots__` to `__private_attrs__`.
 - When you define `__slots__` and `__private_attrs__` in one class, the attributes in `__private_attrs__` can also be defined in the methods, even though they are not in `__slots__`.
 - All of the object that is the instance of the class "PrivateAttrBase" or its subclass are default to be unable to be pickled.
@@ -266,4 +266,4 @@ This package require the c++ module "[picosha2](https://github.com/okdshin/PicoS
 
 ## Support
 
-Now it doesn't support "PyPy".
+Now it only support Cpython.

{private_attribute_cpp-2.1.3 → private_attribute_cpp-2.1.4}/README.md

@@ -56,7 +56,7 @@ print(obj.expensive_api_call(10))   # works with all decorators applied
 | 1 | PrivateWrapProxy | Decorator wrapper for arbitrary decorators | When needed |
 | 2 | private_func=callable | Custom hidden-name generator | Optional |
 | 3 | Pass private_func in class definition | Same as above | Optional |
-| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Yes |
+| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Optional (changed in 2.1.4) |
 | 5 | @PrivateWrapProxy(...) | Make any decorator compatible with private attributes | When needed |
 | 6 | method.result.xxx chain + dummy wrap | Fix decorator order and name conflicts | When needed |
 
@@ -221,8 +221,8 @@ TypeError: Can't instantiate abstract class MyClass without an implementation fo
 
 ## Notes
 
-- All of the private attributes class must contain the `__private_attrs__` attribute.
-- The `__private_attrs__` attribute must be a sequence of strings.
+- ~~All of the private attributes class must contain the `__private_attrs__` attribute.~~(changed in 2.1.4)
+- The `__private_attrs__` attribute must be a sequence of strings or just one string.
 - You cannot define the name which in `__slots__` to `__private_attrs__`.
 - When you define `__slots__` and `__private_attrs__` in one class, the attributes in `__private_attrs__` can also be defined in the methods, even though they are not in `__slots__`.
 - All of the object that is the instance of the class "PrivateAttrBase" or its subclass are default to be unable to be pickled.
@@ -247,4 +247,4 @@ This package require the c++ module "[picosha2](https://github.com/okdshin/PicoS
 
 ## Support
 
-Now it doesn't support "PyPy".
+Now it only support Cpython.

{private_attribute_cpp-2.1.3 → private_attribute_cpp-2.1.4}/private_attribute.cpp

@@ -2333,10 +2333,23 @@ PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationDa
         return false;
     }
 
-    PyObject* __private_attrs__ = PyDict_GetItemString(data.attrs, "__private_attrs__");
-    if (!__private_attrs__) {
-        PyErr_SetString(PyExc_TypeError, "'__private_attrs__' is needed for type 'PrivateAttrType'");
-        return false;
+    PyObjectStorage __private_attrs__;
+    if (PyDict_ContainsString(data.attrs, "__private_attrs__")) {
+        __private_attrs__ = PyDict_GetItemString(data.attrs, "__private_attrs__");
+    }
+    else {
+        __private_attrs__ = PyTuple_New(0);
+        Py_DECREF(__private_attrs__);
+    }
+
+    if (PyUnicode_Check(__private_attrs__)) {
+        PyObject* new___private_attrs__ = PyTuple_New(1);
+        if (!new___private_attrs__) {
+            return false;
+        }
+        PyTuple_SET_ITEM(new___private_attrs__, 0, __private_attrs__);
+        __private_attrs__ = new___private_attrs__;
+        Py_DECREF(__private_attrs__);
     }
 
     if (!PySequence_Check(__private_attrs__)) {
@@ -2379,8 +2392,7 @@ PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationDa
 
         for (const char** p = invalid_name; *p != NULL; p++) {
             if (strcmp(attr_str.c_str(), *p) == 0) {
-                std::string error_msg = "invalid attribute name: '" + std::string(*p) + "'";
-                PyErr_SetString(PyExc_TypeError, error_msg.c_str());
+                PyErr_Format(PyExc_TypeError, "Invalid name '%s' in '__private_attrs__'", attr_str.c_str());
                 return false;
             }
         }
@@ -2421,7 +2433,7 @@ PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationDa
                 }
                 slot_seq = keys;
             } else {
-                slot_seq = PySequence_Fast(all_slots, "__slots__ must be a sequence");
+                slot_seq = PySequence_Fast(all_slots, "__slots__ must be a string, dict or sequence");
             }
             if (!slot_seq) {
                 return false;
@@ -2433,9 +2445,9 @@ PrivateAttrType_preprocess(PyObject* args, PyObject* kwds, PrivateAttrCreationDa
                 PyObject* slot = PySequence_Fast_GET_ITEM(slot_seq, j);
                 if (PyUnicode_Check(slot)) {
                     const char* slot_cstr = PyUnicode_AsUTF8(slot);
-                    if (data.private_attrs_vector_string.find((std::string)slot_cstr) != data.private_attrs_vector_string.end()){
-                        std::string error_msg = "'__slots__' and '__private_attrs__' cannot have the same attribute name: '" + std::string(slot_cstr) + "'";
-                        PyErr_SetString(PyExc_TypeError, error_msg.c_str());
+                    std::string final_name = real_class_name(slot_cstr, data.class_name);
+                    if (data.private_attrs_vector_string.find(final_name) != data.private_attrs_vector_string.end()){
+                        PyErr_Format(PyExc_TypeError, "'__slots__' and '__private_attrs__' cannot have the same attribute name: '%s'", final_name.c_str());
                         Py_DECREF(slot_seq);
                         return false;
                     }

{private_attribute_cpp-2.1.3 → private_attribute_cpp-2.1.4}/private_attribute.pyi

@@ -15,12 +15,12 @@ class MyClass(PrivateAttrBase):
         return self._private_attr1
 ```
 """
-from typing import Any, TypeVar, Callable, TypedDict, Sequence, Generic
+from typing import Any, TypeVar, Callable, TypedDict, Sequence, Generic, Optional
 from types import FunctionType
 
 # define the dict that must have a key "__private_attrs__" and value must be the sequence of strings
 class _PrivateAttrDict(TypedDict):
-    __private_attrs__: Sequence[str]
+    __private_attrs__: Optional[Sequence[str]]
 
 _T = TypeVar('T')
 

{private_attribute_cpp-2.1.3 → private_attribute_cpp-2.1.4/private_attribute_cpp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: private_attribute_cpp
-Version: 2.1.3
+Version: 2.1.4
 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
@@ -75,7 +75,7 @@ print(obj.expensive_api_call(10))   # works with all decorators applied
 | 1 | PrivateWrapProxy | Decorator wrapper for arbitrary decorators | When needed |
 | 2 | private_func=callable | Custom hidden-name generator | Optional |
 | 3 | Pass private_func in class definition | Same as above | Optional |
-| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Yes |
+| 4 | \_\_private_attrs\_\_ list | Declare which attributes are private | Optional (changed in 2.1.4) |
 | 5 | @PrivateWrapProxy(...) | Make any decorator compatible with private attributes | When needed |
 | 6 | method.result.xxx chain + dummy wrap | Fix decorator order and name conflicts | When needed |
 
@@ -240,8 +240,8 @@ TypeError: Can't instantiate abstract class MyClass without an implementation fo
 
 ## Notes
 
-- All of the private attributes class must contain the `__private_attrs__` attribute.
-- The `__private_attrs__` attribute must be a sequence of strings.
+- ~~All of the private attributes class must contain the `__private_attrs__` attribute.~~(changed in 2.1.4)
+- The `__private_attrs__` attribute must be a sequence of strings or just one string.
 - You cannot define the name which in `__slots__` to `__private_attrs__`.
 - When you define `__slots__` and `__private_attrs__` in one class, the attributes in `__private_attrs__` can also be defined in the methods, even though they are not in `__slots__`.
 - All of the object that is the instance of the class "PrivateAttrBase" or its subclass are default to be unable to be pickled.
@@ -266,4 +266,4 @@ This package require the c++ module "[picosha2](https://github.com/okdshin/PicoS
 
 ## Support
 
-Now it doesn't support "PyPy".
+Now it only support Cpython.

{private_attribute_cpp-2.1.3 → private_attribute_cpp-2.1.4}/setup.py

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