pyobject 1.2.6__tar.gz → 1.2.7__tar.gz

pyobject-1.2.7/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 qfcy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{pyobject-1.2.6/pyobject.egg-info → pyobject-1.2.7}/PKG-INFO

@@ -1,13 +1,12 @@
 Metadata-Version: 2.1
 Name: pyobject
-Version: 1.2.6
+Version: 1.2.7
 Summary: 一个提供操作Python对象底层工具的模块。A utility tool with some submodules for operating internal python objects.
 Home-page: https://github.com/qfcy/pyobject
 Author: qfcy
 Author-email: 3076711200@qq.com
 Keywords: pyobject,python,object,utility,object browser,bytecode,reflect,object search,OOP,对象,字节码,对象浏览器
 Classifier: Programming Language :: Python
-Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Topic :: Utilities
 Classifier: Topic :: Software Development :: Bug Tracking
 Classifier: Topic :: Software Development :: Debuggers
@@ -143,7 +142,9 @@ def __init__(self, code=None)
 
 方法
 -------
-### 主要方法
+
+**主要方法**
+
 - ``exec(globals_=None, locals_=None)``：在全局和局部作用域字典中执行代码对象。
 - ``eval(globals_=None, locals_=None)``：在全局和局部作用域字典中执行代码对象，并获取返回值。
 - ``copy()``：复制一份``Code``对象，返回复制的副本。
@@ -152,20 +153,21 @@ def __init__(self, code=None)
 - ``get_flags()``：返回 ``co_flags`` 属性的标志名称列表，如``["NOFREE"]``。
 - ``get_sub_code(name)``：搜索代码的``co_consts``中的子代码，如函数、类定义等，不会递归搜索。返回搜索到的``Code``对象，未找到时抛出``ValueError``。
 
-### 序列化
+**序列化**
+
 - ``to_pycfile(filename)``：使用 ``marshal`` 模块将代码对象转储到 ``.pyc`` 文件中。
 - ``from_pycfile(filename)``：从 ``.pyc`` 文件创建 ``Code`` 实例。
 - ``from_file(filename)``：从 ``.py`` 或 ``.pyc`` 文件创建 ``Code`` 实例。
 - ``pickle(filename)``：将 ``Code`` 对象序列化为 pickle 文件。
 
-### 调试和检查
+**调试和检查**
 
 - ``show(*args, **kw)``：在内部调用``pyobject.desc``，显示代码对象的属性，参数用法和``desc()``的用法相同。
 - ``info()``：在内部调用``dis.show_code``，显示字节码的基本信息。
 - ``dis(*args, **kw)``：调用 ``dis`` 模块输出字节码的反汇编，和``dis.dis(c.to_code())``相同。
 - ``decompile(version=None, *args, **kw)``：调用 ``uncompyle6`` 库将代码对象反编译为源代码。（安装``pyobject``库时， ``uncompyle6`` 库是可选的。）
 
-### 工厂函数
+**工厂函数**
 
 - ``fromfunc(function)``：从 Python 函数对象创建 ``Code`` 实例，和``Code(func.__code__)``相同。
 - ``fromstring(string, mode='exec', filename='')``：从源代码字符串创建 ``Code`` 实例，参数用法和``compile``内置函数相同，在内部调用``compile()``。
@@ -244,10 +246,12 @@ list_in(obj, lst)::
     本函数直接比较对象的指针，提高了效率。
 
 
-版本: 1.2.6
+版本: 1.2.7
 
 更新日志:
 
+2025-3-6(v1.2.7):为pyobject.browser新增了``dir()``中不存在的类属性（如``__flags__``, ``__mro__``），修改了pyobj_extension模块。
+
 2025-2-15(v1.2.6):修复了pyobject.browser浏览过大对象的卡顿问题，改进了pyobject.code_模块，新增了正在开发中的反射库pyobject.super_reflect，
 在pyobj_extension新增了``getrefcount_nogil``和``setrefcount_nogil``。
 
@@ -388,7 +392,9 @@ Attributes introduced in Python 3.8 and later:
 
 Methods
 -------
-### Core Methods
+
+**Core Methods**
+
 - ``exec(globals_=None, locals_=None)``: Executes the code object within the provided global and local scope dictionaries.
 - ``eval(globals_=None, locals_=None)``: Executes the code object within the provided global and local scope dictionaries and returns the result.
 - ``copy()``: Creates a copy of the `Code` object and returns the duplicate.
@@ -397,19 +403,22 @@ Methods
 - ``get_flags()``: Returns a list of flag names for the ``co_flags`` attribute, e.g., ``["NOFREE"]``.
 - ``get_sub_code(name)``: Searches for sub-code objects (e.g., functions or class definitions) in the ``co_consts`` attribute. This method does not perform recursive searches. Returns the found `Code` object or raises a ``ValueError`` if not found.
 
-### Serialization
+**Serialization**
+
 - ``to_pycfile(filename)``: Dumps the code object into a `.pyc` file using the ``marshal`` module.
 - ``from_pycfile(filename)``: Creates a `Code` instance from a `.pyc` file.
 - ``from_file(filename)``: Creates a `Code` instance from a `.py` or `.pyc` file.
 - ``pickle(filename)``: Serializes the `Code` object into a pickle file.
 
-### Debugging and Inspection
+**Debugging and Inspection**
+
 - ``show(*args, **kw)``: Internally calls ``pyobject.desc`` to display the attributes of the code object. The parameters are the same as those used in ``desc()``.
 - ``info()``: Internally calls ``dis.show_code`` to display basic information about the bytecode.
 - ``dis(*args, **kw)``: Calls the ``dis`` module to output the disassembly of the bytecode, equivalent to ``dis.dis(c.to_code())``.
 - ``decompile(version=None, *args, **kw)``: Calls the ``uncompyle6`` library to decompile the code object into source code. (The ``uncompyle6`` library is optional when installing the ``pyobject`` package.)
 
-### Factory Functions
+**Factory Functions**
+
 - ``fromfunc(function)``: Creates a `Code` instance from a Python function object, equivalent to ``Code(func.__code__)``.
 - ``fromstring(string, mode='exec', filename='')``: Creates a `Code` instance from a source code string. The parameters are the same as those used in the built-in ``compile`` function, which is called internally.
 
@@ -486,11 +495,13 @@ list_in(obj, lst)::
     Compared to the built-in Python call "obj in lst" that invokes the "==" operator (__eq__) multiple times, this function directly compares the pointers to improve efficiency.
 
 
-Version: 1.2.6
+Version: 1.2.7
 
 Change Log
 ==========
 
+2025-3-6(v1.2.7): Added support for special class attributes excluded from ``dir()`` (such as ``__flags__``, ``__mro__``) in pyobject.browser and modified the pyobj_extension module.
+
 2025-2-15 (v1.2.6): Fixed the lag issue when browsing large objects in ``pyobject.browser``, improved the ``pyobject.code_`` module, introduced a new reflection library
  ``pyobject.super_reflect`` currently in development, and added ``getrefcount_nogil`` and ``setrefcount_nogil`` to the ``pyobj_extension`` module.
 

{pyobject-1.2.6 → pyobject-1.2.7}/README.rst

@@ -126,7 +126,9 @@ def __init__(self, code=None)
 
 方法
 -------
-### 主要方法
+
+**主要方法**
+
 - ``exec(globals_=None, locals_=None)``：在全局和局部作用域字典中执行代码对象。
 - ``eval(globals_=None, locals_=None)``：在全局和局部作用域字典中执行代码对象，并获取返回值。
 - ``copy()``：复制一份``Code``对象，返回复制的副本。
@@ -135,20 +137,21 @@ def __init__(self, code=None)
 - ``get_flags()``：返回 ``co_flags`` 属性的标志名称列表，如``["NOFREE"]``。
 - ``get_sub_code(name)``：搜索代码的``co_consts``中的子代码，如函数、类定义等，不会递归搜索。返回搜索到的``Code``对象，未找到时抛出``ValueError``。
 
-### 序列化
+**序列化**
+
 - ``to_pycfile(filename)``：使用 ``marshal`` 模块将代码对象转储到 ``.pyc`` 文件中。
 - ``from_pycfile(filename)``：从 ``.pyc`` 文件创建 ``Code`` 实例。
 - ``from_file(filename)``：从 ``.py`` 或 ``.pyc`` 文件创建 ``Code`` 实例。
 - ``pickle(filename)``：将 ``Code`` 对象序列化为 pickle 文件。
 
-### 调试和检查
+**调试和检查**
 
 - ``show(*args, **kw)``：在内部调用``pyobject.desc``，显示代码对象的属性，参数用法和``desc()``的用法相同。
 - ``info()``：在内部调用``dis.show_code``，显示字节码的基本信息。
 - ``dis(*args, **kw)``：调用 ``dis`` 模块输出字节码的反汇编，和``dis.dis(c.to_code())``相同。
 - ``decompile(version=None, *args, **kw)``：调用 ``uncompyle6`` 库将代码对象反编译为源代码。（安装``pyobject``库时， ``uncompyle6`` 库是可选的。）
 
-### 工厂函数
+**工厂函数**
 
 - ``fromfunc(function)``：从 Python 函数对象创建 ``Code`` 实例，和``Code(func.__code__)``相同。
 - ``fromstring(string, mode='exec', filename='')``：从源代码字符串创建 ``Code`` 实例，参数用法和``compile``内置函数相同，在内部调用``compile()``。
@@ -227,10 +230,12 @@ list_in(obj, lst)::
     本函数直接比较对象的指针，提高了效率。
 
 
-版本: 1.2.6
+版本: 1.2.7
 
 更新日志:
 
+2025-3-6(v1.2.7):为pyobject.browser新增了``dir()``中不存在的类属性（如``__flags__``, ``__mro__``），修改了pyobj_extension模块。
+
 2025-2-15(v1.2.6):修复了pyobject.browser浏览过大对象的卡顿问题，改进了pyobject.code_模块，新增了正在开发中的反射库pyobject.super_reflect，
 在pyobj_extension新增了``getrefcount_nogil``和``setrefcount_nogil``。
 
@@ -371,7 +376,9 @@ Attributes introduced in Python 3.8 and later:
 
 Methods
 -------
-### Core Methods
+
+**Core Methods**
+
 - ``exec(globals_=None, locals_=None)``: Executes the code object within the provided global and local scope dictionaries.
 - ``eval(globals_=None, locals_=None)``: Executes the code object within the provided global and local scope dictionaries and returns the result.
 - ``copy()``: Creates a copy of the `Code` object and returns the duplicate.
@@ -380,19 +387,22 @@ Methods
 - ``get_flags()``: Returns a list of flag names for the ``co_flags`` attribute, e.g., ``["NOFREE"]``.
 - ``get_sub_code(name)``: Searches for sub-code objects (e.g., functions or class definitions) in the ``co_consts`` attribute. This method does not perform recursive searches. Returns the found `Code` object or raises a ``ValueError`` if not found.
 
-### Serialization
+**Serialization**
+
 - ``to_pycfile(filename)``: Dumps the code object into a `.pyc` file using the ``marshal`` module.
 - ``from_pycfile(filename)``: Creates a `Code` instance from a `.pyc` file.
 - ``from_file(filename)``: Creates a `Code` instance from a `.py` or `.pyc` file.
 - ``pickle(filename)``: Serializes the `Code` object into a pickle file.
 
-### Debugging and Inspection
+**Debugging and Inspection**
+
 - ``show(*args, **kw)``: Internally calls ``pyobject.desc`` to display the attributes of the code object. The parameters are the same as those used in ``desc()``.
 - ``info()``: Internally calls ``dis.show_code`` to display basic information about the bytecode.
 - ``dis(*args, **kw)``: Calls the ``dis`` module to output the disassembly of the bytecode, equivalent to ``dis.dis(c.to_code())``.
 - ``decompile(version=None, *args, **kw)``: Calls the ``uncompyle6`` library to decompile the code object into source code. (The ``uncompyle6`` library is optional when installing the ``pyobject`` package.)
 
-### Factory Functions
+**Factory Functions**
+
 - ``fromfunc(function)``: Creates a `Code` instance from a Python function object, equivalent to ``Code(func.__code__)``.
 - ``fromstring(string, mode='exec', filename='')``: Creates a `Code` instance from a source code string. The parameters are the same as those used in the built-in ``compile`` function, which is called internally.
 
@@ -469,11 +479,13 @@ list_in(obj, lst)::
     Compared to the built-in Python call "obj in lst" that invokes the "==" operator (__eq__) multiple times, this function directly compares the pointers to improve efficiency.
 
 
-Version: 1.2.6
+Version: 1.2.7
 
 Change Log
 ==========
 
+2025-3-6(v1.2.7): Added support for special class attributes excluded from ``dir()`` (such as ``__flags__``, ``__mro__``) in pyobject.browser and modified the pyobj_extension module.
+
 2025-2-15 (v1.2.6): Fixed the lag issue when browsing large objects in ``pyobject.browser``, improved the ``pyobject.code_`` module, introduced a new reflection library
  ``pyobject.super_reflect`` currently in development, and added ``getrefcount_nogil`` and ``setrefcount_nogil`` to the ``pyobj_extension`` module.
 

{pyobject-1.2.6 → pyobject-1.2.7}/pyobject/__init__.py

@@ -6,7 +6,7 @@ from warnings import warn
 from pprint import pprint
 
 __author__="qfcy"
-__version__="1.2.6"
+__version__="1.2.7"
 
 _ignore_names=["__builtins__","__doc__"]
 __all__=["objectname","bases","describe","desc"]
@@ -15,7 +15,8 @@ def objectname(obj):
     """objectname(obj) - Returns the name of an object in the format xxmodule.xxclass.
 For example: objectname(int) -> 'builtins.int'."""
     if not obj.__class__==type:obj=obj.__class__
-    if obj.__module__=="__main__":return obj.__name__
+    if not hasattr(obj,"__module__") or obj.__module__=="__main__":
+        return obj.__name__
     return "{}.{}".format(obj.__module__,obj.__name__)
 
 ###无递归版本
@@ -106,7 +107,9 @@ except (ImportError,SystemError):warn("Failed to import pyobject.code_.")
 try:
     from pyobj_extension import *
     __all__.extend(["convptr","py_incref","py_decref","getrealrefcount",
-                    "setrefcount","list_in","getrefcount_nogil","setrefcount_nogil"])
+                    "setrefcount","list_in","getrefcount_nogil","setrefcount_nogil",
+                    "get_type_flag","set_type_flag","set_type_base","set_type_bases",
+                    "set_type_mro"])
 except ImportError:warn("Failed to import module pyobj_extension.")
 
 def test():

{pyobject-1.2.6 → pyobject-1.2.7}/pyobject/browser.py

@@ -20,19 +20,18 @@ except ImportError:from __init__ import objectname,_shortrepr
 _IMAGE_PATH=os.path.join(os.path.split(__file__)[0],"images")
 SKIP=(WrapperDescriptorType, MethodWrapperType,\
      MethodDescriptorType, ClassMethodDescriptorType)
+TYPE_EXTRA_ATTRS = ("__basicsize__","__dictoffset__","__flags__",
+    "__itemsize__","__weakrefoffset__")
+TYPE_EXTRA_CLASS_ATTRS = ("__base__","__bases__","__mro__")
 
 def isfunc(obj):
     # 判断一个对象是否为函数或方法
     if isfunction(obj) or ismethod(obj):return True
     # 使用typing而不用types.WrapperDescriptorType是为了与旧版本兼容
     func_types=[types.LambdaType,types.BuiltinFunctionType,
-                types.BuiltinMethodType,typing.WrapperDescriptorType,
-                typing.MethodWrapperType,typing.MethodDescriptorType]
-    if sys.version_info.minor>=7:
-        ClassMethodDescriptorType=types.ClassMethodDescriptorType
-    else: # 3.7之前的旧版本
-        ClassMethodDescriptorType=type(dict.__dict__['fromkeys'])
-    func_types.append(ClassMethodDescriptorType)
+                types.BuiltinMethodType,WrapperDescriptorType,
+                MethodWrapperType,MethodDescriptorType,
+                ClassMethodDescriptorType]
     for type_ in func_types:
         if isinstance(obj,type_):
             return True
@@ -223,15 +222,19 @@ class ObjectBrowser():
             self.tvw.item(self.functions_tag,open=True)
         # 添加属性
         attrs=dir(obj)
+        if isinstance(obj,type):
+            for attr in TYPE_EXTRA_ATTRS:
+                if hasattr(obj,attr):
+                    attrs.append(attr) # 对类添加额外的，一般不会出现在dir()的返回值的属性
         for i in range(len(attrs)):
             attr=attrs[i]
             if self.verbose or not attr.startswith("_"):
                 try:
-                    object=getattr(obj,attr)
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
-                    tags=("gray",) if isinstance(object,SKIP) else () # 将部分类型设为灰色，如MethodWrapperType
-                    self.tvw.insert(self._get_type(object), tk.END, #attr,
+                    object_=getattr(obj,attr)
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
+                    tags=("gray",) if isinstance(object_,SKIP) else () # 将部分类型设为灰色，如MethodWrapperType
+                    self.tvw.insert(self._get_type(object_), tk.END, #attr,
                                     text=attr, image=image,
                                     values=(value,),tags=tags) # values从第二列开始
                 except Exception as error: # 显示错误消息
@@ -239,20 +242,30 @@ class ObjectBrowser():
                     self.tvw.insert(self.attributes_tag, tk.END,
                                     text=attr, image=self.obj_image,
                                     values=(value,),tags=("error",))
-        # __bases__属性一般不会出现在dir()的返回值中
-        if hasattr(obj,"__bases__") and "__bases__" not in attrs:
-            bases=obj.__bases__
-            self.tvw.insert(self.classes_tag, tk.END, "__bases__",
-                            text="__bases__", image=self._get_image(bases),
-                            values=(repr(bases),))
+        # 添加类特有的属性 (不会在dir()出现)
+        if isinstance(obj,type):
+            for attr in TYPE_EXTRA_CLASS_ATTRS:
+                if not hasattr(obj,attr):continue
+                try:
+                    object_=getattr(obj,attr)
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    self.tvw.insert(self.classes_tag, tk.END,
+                                    text=attr, image=self._get_image(object_),
+                                    values=(value,))
+                except Exception as error: # 显示错误
+                    value='<{}: {}>'.format(type(error).__name__,str(error))
+                    self.tvw.insert(self.classes_tag, tk.END,
+                                    text=attr, image=self.obj_image,
+                                    values=(value,),tags=("error",))
+
         # 添加列表数据
         if isinstance(obj,(list,tuple)):
             for i in range(len(obj)):
                 index=str(i)
                 try:
-                    object=obj[i]
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
+                    object_=obj[i]
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
                     self.tvw.insert(self.lst_tag, tk.END,
                                     text=index, image=image,
                                     values=(value,))
@@ -267,9 +280,9 @@ class ObjectBrowser():
             for key in obj.keys():
                 key_name=repr(key)
                 try:
-                    object=obj[key]
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
+                    object_=obj[key]
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
                     self.tvw.insert(self.dict_tag, tk.END,
                                     text=key_name, image=image,
                                     values=(value,))
@@ -420,11 +433,11 @@ class ObjectBrowser():
             try:
                 # 对象的属性可能有改变，重新获取对象的属性
                 scope={self.rootobj_name:self.root_obj} # 获取第一个浏览的根对象及其名称
-                object=eval(path,scope)
+                object_=eval(path,scope)
             except Exception: # 默认使用新获取的对象，只有出错时，才使用旧的对象
-                object=obj
-        else:object=obj
-        self.browse(object,path)
+                object_=obj
+        else:object_=obj
+        self.browse(object_,path)
     def back(self): # 后退
         if self.history_index!=0:
             self.history_index-=1

{pyobject-1.2.6 → pyobject-1.2.7}/pyobject/pyobj_extension.c

@@ -204,6 +204,67 @@ PyObject *_list_setnull(PyObject *self, PyObject *args) {
     Py_RETURN_NONE;
 }
 
+static PyObject* get_type_flag(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static char *kwlist[] = {"typeobj", NULL};
+    PyObject *typeobj;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O", kwlist, &typeobj))
+        return NULL;
+
+    PyTypeObject *type = (PyTypeObject *)typeobj;
+    unsigned long flags = type->tp_flags;
+    return PyLong_FromUnsignedLong(flags);
+}
+static PyObject* set_type_flag(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static char *kwlist[] = {"typeobj", "flag", NULL};
+    PyObject *typeobj, *flag;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO", kwlist, &typeobj, &flag))
+        return NULL;
+
+    unsigned long new_flag = PyLong_AsUnsignedLong(flag);
+    PyTypeObject *type = (PyTypeObject *)typeobj;
+    type->tp_flags = new_flag;
+    Py_RETURN_NONE;
+}
+
+static PyObject* set_type_base(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static char *kwlist[] = {"typeobj", "base", NULL};
+    PyObject *typeobj, *base;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO", kwlist, &typeobj, &base))
+        return NULL;
+
+    Py_INCREF(base);
+    PyTypeObject *type = (PyTypeObject *)typeobj;
+    type->tp_base = base;
+    Py_RETURN_NONE;
+}
+static PyObject* set_type_bases(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static char *kwlist[] = {"typeobj", "bases", NULL};
+    PyObject *typeobj, *bases;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO", kwlist, &typeobj, &bases))
+        return NULL;
+
+    Py_INCREF(bases);
+    PyTypeObject *type = (PyTypeObject *)typeobj;
+    type->tp_bases = bases;
+    Py_RETURN_NONE;
+}
+static PyObject* set_type_mro(PyObject *self, PyObject *args, PyObject *kwargs) {
+    static char *kwlist[] = {"typeobj", "mro", NULL};
+    PyObject *typeobj, *mro;
+
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OO", kwlist, &typeobj, &mro))
+        return NULL;
+
+    Py_INCREF(mro);
+    PyTypeObject *type = (PyTypeObject *)typeobj;
+    type->tp_mro = mro;
+    Py_RETURN_NONE;
+}
+
 /*
  * List of functions to add to pyobj_extension in exec_pyobj_extension().
  */
@@ -216,7 +277,13 @@ static PyMethodDef pyobj_extension_functions[] = {
     { "getrefcount_nogil", (PyCFunction)getrefcount_nogil, METH_VARARGS, getrefcount_nogil_doc },
     { "setrefcount_nogil", (PyCFunction)setrefcount_nogil, METH_VARARGS | METH_KEYWORDS, setrefcount_nogil_doc },
     { "list_in", (PyCFunction)list_in, METH_VARARGS | METH_KEYWORDS, list_in_doc },
+
     { "_list_setnull", (PyCFunction)_list_setnull, METH_VARARGS, "_list_setnull(lst,index)"},
+    {"get_type_flag", (PyCFunction)get_type_flag, METH_VARARGS | METH_KEYWORDS, "get_type_flag(typeobj: type)"},
+    {"set_type_flag", (PyCFunction)set_type_flag, METH_VARARGS | METH_KEYWORDS, "set_type_flag(typeobj: type, flag: int)"},
+    {"set_type_base", (PyCFunction)set_type_base, METH_VARARGS | METH_KEYWORDS, "set_type_base(typeobj: type, base: type)"},
+    {"set_type_bases", (PyCFunction)set_type_bases, METH_VARARGS | METH_KEYWORDS, "set_type_bases(typeobj: type, bases: tuple)"},
+    {"set_type_mro", (PyCFunction)set_type_mro, METH_VARARGS | METH_KEYWORDS, "set_type_mro(typeobj: type, mro: tuple)"},
     { NULL, NULL, 0, NULL } /* marks end of array */
 };
 
@@ -227,7 +294,7 @@ static PyMethodDef pyobj_extension_functions[] = {
 int exec_pyobj_extension(PyObject *module) {
     PyModule_AddFunctions(module, pyobj_extension_functions);
     PyModule_AddStringConstant(module, "__author__", "qfcy");
-    PyModule_AddStringConstant(module, "__version__", "1.2.6");
+    PyModule_AddStringConstant(module, "__version__", "1.2.7");
     PyModule_AddIntConstant(module, "_REFCNT_DELTA", REFCNT_DELTA);
 
     return 0; /* success */

{pyobject-1.2.6 → pyobject-1.2.7}/pyobject/test/browser_chs_locale.py

@@ -21,19 +21,18 @@ except ImportError:from __init__ import objectname,_shortrepr
 _IMAGE_PATH=os.path.join(os.path.split(__file__)[0],"..","images")
 SKIP=(WrapperDescriptorType, MethodWrapperType,\
      MethodDescriptorType, ClassMethodDescriptorType)
+TYPE_EXTRA_ATTRS = ("__basicsize__","__dictoffset__","__flags__",
+    "__itemsize__","__weakrefoffset__")
+TYPE_EXTRA_CLASS_ATTRS = ("__base__","__bases__","__mro__")
 
 def isfunc(obj):
     # 判断一个对象是否为函数或方法
     if isfunction(obj) or ismethod(obj):return True
     # 使用typing而不用types.WrapperDescriptorType是为了与旧版本兼容
     func_types=[types.LambdaType,types.BuiltinFunctionType,
-                types.BuiltinMethodType,typing.WrapperDescriptorType,
-                typing.MethodWrapperType,typing.MethodDescriptorType]
-    if sys.version_info.minor>=7:
-        ClassMethodDescriptorType=types.ClassMethodDescriptorType
-    else: # 3.7之前的旧版本
-        ClassMethodDescriptorType=type(dict.__dict__['fromkeys'])
-    func_types.append(ClassMethodDescriptorType)
+                types.BuiltinMethodType,WrapperDescriptorType,
+                MethodWrapperType,MethodDescriptorType,
+                ClassMethodDescriptorType]
     for type_ in func_types:
         if isinstance(obj,type_):
             return True
@@ -148,7 +147,8 @@ class ObjectBrowser():
         self.tvw.pack(side=tk.BOTTOM,expand=True,fill=tk.BOTH)
 
         self.menu=tk.Menu(self.master,tearoff=False)
-        self.menu.add_command(label="新窗口打开",command=self.open_in_new_window,state=tk.DISABLED)
+        self.menu.add_command(label="新窗口打开",command=self.open_in_new_window,
+                              state=tk.DISABLED)
         self.menu.add_command(label="新增属性",command=self.new_item,state=tk.DISABLED)
         self.menu.add_command(label="删除",command=self.del_item,state=tk.DISABLED)
         def on_rightclick(event):
@@ -214,7 +214,7 @@ class ObjectBrowser():
             return self.classes_tag
         else:return self.attributes_tag
     def refresh(self,event=None,_first=False): # _first: 是否为初次加载
-        "更新自身显示的数据。"
+        # 更新自身显示的数据
         obj=self.obj
         self.master.title("{} - {}".format(self.title,objectname(obj)))
         self.label["text"]=" 路径: %s 对象: %s" % (self.name, _shortrepr(obj))
@@ -223,15 +223,19 @@ class ObjectBrowser():
             self.tvw.item(self.functions_tag,open=True)
         # 添加属性
         attrs=dir(obj)
+        if isinstance(obj,type):
+            for attr in TYPE_EXTRA_ATTRS:
+                if hasattr(obj,attr):
+                    attrs.append(attr) # 对类添加额外的，一般不会出现在dir()的返回值的属性
         for i in range(len(attrs)):
             attr=attrs[i]
             if self.verbose or not attr.startswith("_"):
                 try:
-                    object=getattr(obj,attr)
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
-                    tags=("gray",) if isinstance(object,SKIP) else () # 将部分类型设为灰色，如MethodWrapperType
-                    self.tvw.insert(self._get_type(object), tk.END, #attr,
+                    object_=getattr(obj,attr)
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
+                    tags=("gray",) if isinstance(object_,SKIP) else () # 将部分类型设为灰色，如MethodWrapperType
+                    self.tvw.insert(self._get_type(object_), tk.END, #attr,
                                     text=attr, image=image,
                                     values=(value,),tags=tags) # values从第二列开始
                 except Exception as error: # 显示错误消息
@@ -239,20 +243,30 @@ class ObjectBrowser():
                     self.tvw.insert(self.attributes_tag, tk.END,
                                     text=attr, image=self.obj_image,
                                     values=(value,),tags=("error",))
-        # __bases__属性一般不会出现在dir()的返回值中
-        if hasattr(obj,"__bases__") and "__bases__" not in attrs:
-            bases=obj.__bases__
-            self.tvw.insert(self.classes_tag, tk.END, "__bases__",
-                            text="__bases__", image=self._get_image(bases),
-                            values=(repr(bases),))
+        # 添加类特有的属性 (不会在dir()出现)
+        if isinstance(obj,type):
+            for attr in TYPE_EXTRA_CLASS_ATTRS:
+                if not hasattr(obj,attr):continue
+                try:
+                    object_=getattr(obj,attr)
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    self.tvw.insert(self.classes_tag, tk.END,
+                                    text=attr, image=self._get_image(object_),
+                                    values=(value,))
+                except Exception as error: # 显示错误
+                    value='<{}: {}>'.format(type(error).__name__,str(error))
+                    self.tvw.insert(self.classes_tag, tk.END,
+                                    text=attr, image=self.obj_image,
+                                    values=(value,),tags=("error",))
+
         # 添加列表数据
         if isinstance(obj,(list,tuple)):
             for i in range(len(obj)):
                 index=str(i)
                 try:
-                    object=obj[i]
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
+                    object_=obj[i]
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
                     self.tvw.insert(self.lst_tag, tk.END,
                                     text=index, image=image,
                                     values=(value,))
@@ -267,9 +281,9 @@ class ObjectBrowser():
             for key in obj.keys():
                 key_name=repr(key)
                 try:
-                    object=obj[key]
-                    value=_shortrepr(object,self.MAX_VIEW_LEN)
-                    image=self._get_image(object)
+                    object_=obj[key]
+                    value=_shortrepr(object_,self.MAX_VIEW_LEN)
+                    image=self._get_image(object_)
                     self.tvw.insert(self.dict_tag, tk.END,
                                     text=key_name, image=image,
                                     values=(value,))
@@ -420,11 +434,11 @@ class ObjectBrowser():
             try:
                 # 对象的属性可能有改变，重新获取对象的属性
                 scope={self.rootobj_name:self.root_obj} # 获取第一个浏览的根对象及其名称
-                object=eval(path,scope)
+                object_=eval(path,scope)
             except Exception: # 默认使用新获取的对象，只有出错时，才使用旧的对象
-                object=obj
-        else:object=obj
-        self.browse(object,path)
+                object_=obj
+        else:object_=obj
+        self.browse(object_,path)
     def back(self): # 后退
         if self.history_index!=0:
             self.history_index-=1