pyobject 1.2.9__tar.gz → 1.2.9.2__tar.gz

{pyobject-1.2.9/pyobject.egg-info → pyobject-1.2.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobject
-Version: 1.2.9
+Version: 1.2.9.2
 Summary: A multifunctional all-in-one utility tool for managing internal Python objects, compatible with nearly all Python 3 versions. 一个多功能合一的提供操作Python对象底层工具的Python包, 支持几乎所有Python 3版本。 
 Home-page: https://github.com/qfcy/pyobject
 Author: qfcy
@@ -351,7 +351,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
    unused_var = func(temp_var)
 
 | 代码中\ ``temp_var``\ 只有一条指向\ ``unused_var``\ 的边，而\ ``unused_var``\ 没有任何指出的边。
-| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，并去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
+| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，得到\ ``unused_var = func([1,2,3])``\ ，再去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
 
 模块\ ``pyobject.pyobj_extension``
 ----------------------------------
@@ -394,7 +394,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
 lst调用多次==运算符(``__eq__``)相比，
 本函数直接比较对象的指针，提高了效率。
 
-**``pyobject``\ 当前版本**: 1.2.9
+**``pyobject``\ 当前版本**: 1.2.9.2
 
 更新日志:
 ---------
@@ -829,9 +829,9 @@ Implementation Details
 
 | Here, ``temp_var`` only has one edge pointing to ``unused_var``, while
   ``unused_var`` does not point to any other node.
-| By inlining the value of ``temp_var`` into ``func(temp_var)`` and
-  removing ``unused_var``, the optimized code becomes
-  ``func([1, 2, 3])``.
+| By inlining the value of ``temp_var`` into ``func(temp_var)``, the
+  code becomes ``unused_var = func([1,2,3])``. After removing
+  ``unused_var``, the optimized code is ``func([1, 2, 3])``.
 
 Module: ``pyobj_extension``
 ---------------------------
@@ -886,7 +886,7 @@ Python call “obj in lst” that invokes the “==” operator (``__eq__``)
 multiple times, this function directly compares the pointers to improve
 efficiency.
 
-**Current Version of ``pyobject``**: 1.2.9
+**Current Version of ``pyobject``**: 1.2.9.2
 
 Change Log
 ----------

{pyobject-1.2.9 → pyobject-1.2.9.2}/README.rst

@@ -334,7 +334,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
    unused_var = func(temp_var)
 
 | 代码中\ ``temp_var``\ 只有一条指向\ ``unused_var``\ 的边，而\ ``unused_var``\ 没有任何指出的边。
-| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，并去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
+| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，得到\ ``unused_var = func([1,2,3])``\ ，再去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
 
 模块\ ``pyobject.pyobj_extension``
 ----------------------------------
@@ -377,7 +377,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
 lst调用多次==运算符(``__eq__``)相比，
 本函数直接比较对象的指针，提高了效率。
 
-**``pyobject``\ 当前版本**: 1.2.9
+**``pyobject``\ 当前版本**: 1.2.9.2
 
 更新日志:
 ---------
@@ -812,9 +812,9 @@ Implementation Details
 
 | Here, ``temp_var`` only has one edge pointing to ``unused_var``, while
   ``unused_var`` does not point to any other node.
-| By inlining the value of ``temp_var`` into ``func(temp_var)`` and
-  removing ``unused_var``, the optimized code becomes
-  ``func([1, 2, 3])``.
+| By inlining the value of ``temp_var`` into ``func(temp_var)``, the
+  code becomes ``unused_var = func([1,2,3])``. After removing
+  ``unused_var``, the optimized code is ``func([1, 2, 3])``.
 
 Module: ``pyobj_extension``
 ---------------------------
@@ -869,7 +869,7 @@ Python call “obj in lst” that invokes the “==” operator (``__eq__``)
 multiple times, this function directly compares the pointers to improve
 efficiency.
 
-**Current Version of ``pyobject``**: 1.2.9
+**Current Version of ``pyobject``**: 1.2.9.2
 
 Change Log
 ----------

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/__init__.py

@@ -6,7 +6,7 @@ import sys
 from warnings import warn
 from pprint import pprint
 
-__version__="1.2.9"
+__version__="1.2.9.2"
 
 __all__=["objectname","bases","describe","desc"]
 _ignore_names=["__builtins__","__doc__"]
@@ -97,10 +97,10 @@ try:
                     "set_type_subclasses_by_cls"])
 except ImportError:warn("Failed to import pyobject.pyobj_extension.")
 try:
-    from pyobject.objproxy import DynObj,ObjChain,ProxiedObj,accept_raw_obj
-    __all__.extend(["DynObj","ObjChain","ProxiedObj","accept_raw_obj"])
+    from pyobject.objproxy import DynObj,ObjChain,ProxiedObj
+    __all__.extend(["DynObj","ObjChain","ProxiedObj"])
 except (ImportError, SyntaxError):
-    warn("Failed to import pyobject.objproxy.") # SyntaxError: Python 3.5及以下不支持f-string
+    warn("Failed to import pyobject.objproxy.") # Python 3.5及以下不支持f-string，无法使用objproxy库
 
 def desc_demo():
     try:

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/objproxy/__init__.py

@@ -19,28 +19,32 @@ INDENT = 4
 NOCODE_EXPORT_ATTRS = ["__class__","__dict__"] # 不留下代码记录的导出属性
 DEFAULT_EXPORT_FUNCS = [] # 在magic_meth_chained中自动生成
 
-def unproxy_obj(obj): # 递归解除obj的代理（备用函数）
-    while isinstance(obj, ProxiedObj):
+def unproxy_obj(obj):
+    if _isinstance(obj, ProxiedObj):
         obj = obj._ProxiedObj__target_obj
+    return obj
 
+def unproxy_obj_recursive(obj): # 递归解除obj的代理（备用函数）
+    while _isinstance(obj, ProxiedObj):
+        obj = obj._ProxiedObj__target_obj
     # 递归处理容器
-    if isinstance(obj, dict):
-        return {unproxy_obj(k): unproxy_obj(v) for k, v in obj.items()}
-    elif isinstance(obj, list):
-        return [unproxy_obj(item) for item in obj]
-    elif isinstance(obj, tuple):
-        return tuple(unproxy_obj(item) for item in obj)
-    elif isinstance(obj, set):
-        return {unproxy_obj(item) for item in obj}
+    if _isinstance(obj, dict):
+        return {unproxy_obj_recursive(k): unproxy_obj_recursive(v)
+                for k, v in obj.items()}
+    elif _isinstance(obj, list):
+        return [unproxy_obj_recursive(item) for item in obj]
+    elif _isinstance(obj, tuple):
+        return tuple(unproxy_obj_recursive(item) for item in obj)
+    elif _isinstance(obj, set):
+        return {unproxy_obj_recursive(item) for item in obj}
     else:
         return obj
-
 def accept_raw_obj(func,process_arg=None,process_kw=None,process_ret=None):
     # 装饰器，用于有target_obj时只接受原始对象而不是ProxiedObj的函数（备用）
     @functools.wraps(func)
     def inner(*args,**kw):
-        args = unproxy_obj(args)
-        kw = unproxy_obj(kw)
+        args = unproxy_obj_recursive(args)
+        kw = unproxy_obj_recursive(kw)
 
         if process_arg is not None:
             args = process_arg(args)
@@ -56,9 +60,9 @@ def accept_raw_obj(func,process_arg=None,process_kw=None,process_ret=None):
         return result
     return inner
 
-class EmptyTarget:
+class _EmptyTarget:
     def __bool__(self):return False
-EMPTY_OBJ = EmptyTarget() # 空对象的特殊值
+EMPTY_OBJ = _EmptyTarget() # 空对象的特殊值
 class ReprFormatProxy:
     def __init__(self,target_obj,repr_func):
         self.target_obj = target_obj
@@ -77,7 +81,7 @@ def basic_repr(obj):
     return object.__repr__(obj)
 
 def is_trivial_obj(obj): # 检查对象能否被repr()表示（即对象必须是基本类型）
-    if isinstance(obj, ProxiedObj):
+    if _isinstance(obj, ProxiedObj):
         obj = obj._ProxiedObj__target_obj
         if obj is EMPTY_OBJ:return True
     if type(obj) not in TRIVIAL_TYPES: # 不使用isinstance（由于不能是基本类型子类）
@@ -93,21 +97,39 @@ def is_builtin_type(cls): # 备用函数
         flag = get_type_flag(cls)
         if not flag & Py_TPFLAGS_HEAPTYPE or flag & _Py_TPFLAGS_STATIC_BUILTIN:
             return True
+        return False
     else:
         return True
         #if cls in vars(builtins).values() or cls in vars(types).values():
         #    return True
     #return False
 
-def proxyCls(obj=None):
+def proxyCls(T=_EmptyTarget, chain=EMPTY_OBJ, fromvar=None):
     # 泛型，proxyCls(T)生成类型信息为T的继承自ProxiedObj的类
-    if obj is None:
+    if T is EMPTY_OBJ:
         return ProxiedObj
-    if not isinstance(obj,type): # obj不是类
-        T = type(obj)
-    else:T = obj
-    class ProxyCls(ProxiedObj): # 创建同时从ProxiedObj与target_obj继承的类
+
+    class ProxyCls(ProxiedObj): # 创建同时从ProxiedObj与T继承的类
+        # pylint: disable=unused-private-member
         __proto = T # 自身使用的原型
+        def __new__(cls,*args,**kw):
+            _chain = args[0] if args else kw.get("chain")
+            if not _isinstance(_chain,ObjChain) and chain is not EMPTY_OBJ:
+                var = chain.new_var(T.__name__)
+                if fromvar is not None:
+                    # pylint: disable=self-cls-assignment
+                    cls = chain.add_existing_obj(T,var,f"{var} = {fromvar}.__class__",
+                                                 [fromvar])
+                else:
+                    cls = chain.add_existing_obj(T,var, # pylint: disable=self-cls-assignment
+                        f"# class {var}: {shortrepr(cls,repr_func=basic_repr)}")
+                if len(args) == 3 and isinstance(T,type):
+                    args=(args[0],tuple(unproxy_obj(cls) for cls in args[1]),args[2])
+
+                if kw:return cls(*args,**kw)
+                return cls(*args) # 返回ProxyCls
+            else:
+                return ProxiedObj.__new__(cls,*args,**kw)
 
     return ProxyCls
 
@@ -148,7 +170,7 @@ class ObjChain:
         # 自动检测依赖的变量，返回变量名的列表和未知对象的列表
         result = []; unknown = []
         for obj in itertools.chain(*iterables):
-            if isinstance(obj,ProxiedObj):
+            if _isinstance(obj,ProxiedObj):
                 self._assert_assoc_with(obj) # 确保关联到自身
                 result.append(obj._ProxiedObj__name)
             elif id(obj) in self.exported_vars:
@@ -192,8 +214,8 @@ class ObjChain:
         else:
             exec(statement,self.scope)
             result = self.scope[name]
-        return proxyCls(result)(self,name,target_obj=result,
-                                export_trivial_obj=export_trivial_obj)
+        return proxyCls(type(result),self,name)(self,name,result,
+                                                export_trivial_obj=export_trivial_obj)
     def add_existing_obj(self,obj,name,statement=None,dependency_vars=None,
                          export_funcs=None,export_attrs=None,extra_info=None,
                          export_trivial_obj=None,_export_call=False,
@@ -213,8 +235,8 @@ class ObjChain:
             self.custom_export_attr_check[name] = custom_export_attr
 
         self.add_code(statement,name,dependency_vars,**(extra_info or {}))
-        self.scope[name] = proxyCls(obj)(self, name, _export_call, target_obj = obj,
-                                         export_trivial_obj = export_trivial_obj)
+        self.scope[name] = proxyCls(type(obj),self,name)(self, name, obj, _export_call,
+                                                         export_trivial_obj = export_trivial_obj)
         return self.scope[name]
     def add_exported_obj(self,obj,name): # 添加已导出的对象，仅更新exported_vars
         self.exported_vars[id(obj)] = name
@@ -232,7 +254,7 @@ class ObjChain:
         if obj._ProxiedObj__chain is not self:
             raise ValueError("chain.get_repr(obj): obj is not associated with this chain")
     def get_target(self,obj): # 获取ProxiedObj的目标对象
-        if not isinstance(obj,ProxiedObj):
+        if not _isinstance(obj,ProxiedObj):
             raise TypeError("obj should be an instance of ProxiedObj")
         self._assert_assoc_with(obj)
         target = obj._ProxiedObj__target_obj
@@ -258,7 +280,7 @@ class ObjChain:
                     return varname
                 num += 1
     def get_repr(self,obj): # 用于代码生成中的repr，如果对象是ProxiedObj，则直接返回对应的变量名
-        if isinstance(obj,ProxiedObj):
+        if _isinstance(obj,ProxiedObj):
             self._assert_assoc_with(obj)
             return obj._ProxiedObj__name
         else:
@@ -355,7 +377,7 @@ class ObjChain:
                 if export or use_exported_obj: # use_exported_obj: 是否在不导出时也在exec用target_obj作为变量，避免递归
                     scope = {}
                     for var in self.code_vars[cur_idx][1]: # 导出时，不使用ProxiedObj执行，避免递归
-                        if isinstance(self.scope[var],ProxiedObj):
+                        if _isinstance(self.scope[var],ProxiedObj):
                             self._assert_assoc_with(self.scope[var])
                             scope[var] = self.scope[var]._ProxiedObj__target_obj
                         else:
@@ -443,8 +465,8 @@ def magic_meth_chained(fmt = None, use_newvar = True, indent_delta = 0,
                     result = chain.eval_value(new_var) # 逐行一次性执行代码，并返回结果
                     return result
             if use_newvar:
-                return proxyCls(result)(chain,new_var,target_obj=result,
-                                        export_trivial_obj=self._ProxiedObj__export_trivial_obj)
+                return proxyCls(type(result),self._ProxiedObj__chain,new_var)(chain,new_var,
+                            result,export_trivial_obj=self._ProxiedObj__export_trivial_obj)
             return self
 
         return override
@@ -454,10 +476,12 @@ class ProxiedObj:
     # 代理其他对象的类（建议使用ObjChain的new_object和add_existing_obj方法，而不是实例化本类）
     # 如果有target_obj，则内部应使用泛型proxyCls(T)替代ProxiedObj类，
     # 避免isinstance检测返回False
-    def __init__(self,chain,name,_export_call=False,
-                 target_obj=EMPTY_OBJ,export_trivial_obj=False):
+    def __init__(self,chain,name,target_obj=EMPTY_OBJ,
+                 _export_call=False,export_trivial_obj=False):
         # target_obj: 要操作（代理）的目标对象，可选
         # _export_call: 当前对象的__call__是否会导出真正的结果（而不是下一个ProxiedObj）
+        if "_ProxiedObj__chain" in object.__getattribute__(self,"__dict__"):
+            return # 已经初始化过
         self.__chain=chain
         self.__name=name
         self.__export_call=_export_call
@@ -472,6 +496,7 @@ class ProxiedObj:
             self.__chain.proxies[id(target_obj)] = self
 
         self.__export_trivial_obj=export_trivial_obj
+        # pylint: disable=unused-private-member
         self.__no_self_attr = True # 不再使用自身的属性
     def __call__(self,*args,**kw):
         depend_vars = self.__chain._detect_var_and_add_obj((self,), args, kw.values())
@@ -490,8 +515,7 @@ class ProxiedObj:
                     return self.__target_obj(*args,**kw)
                 else:
                     return self.__target_obj(*args) # 避免对不接收关键字参数的函数传递关键字
-            result = self.__chain._get_new_targetobj(self.__target_obj,new_var,_getter,
-                                                     use_exported_obj=True)
+            result = self.__chain._get_new_targetobj(self.__target_obj,new_var,_getter)
 
         if self.__export_call or (self.__export_trivial_obj
                                   and is_trivial_obj(result)):
@@ -506,9 +530,8 @@ class ProxiedObj:
             if self.__name in self.__chain.export_funcs:
                 self.__chain.export_funcs[new_var] = self.__chain.\
                                                      export_funcs[self.__name].copy()
-        return proxyCls(result)(self.__chain,new_var,
-                                target_obj=result,
-                                export_trivial_obj=self.__export_trivial_obj)
+        return proxyCls(type(result),self.__chain,self.__name)(self.__chain,new_var,
+                                    result,export_trivial_obj=self.__export_trivial_obj)
 
     #@magic_meth_chained("{_var} = {_self}.{}")
     def __getattr__(self,attr):
@@ -537,9 +560,10 @@ class ProxiedObj:
         else:
             self.__chain.update_exports(self.__name, attr, new_var)
 
-        return proxyCls(result)(self.__chain,new_var,
-                                self.__chain.is_export_func(attr,self.__name),
-                                result,self.__export_trivial_obj)
+        return proxyCls(type(result),self.__chain,self.__name)(
+                            self.__chain,new_var,result,
+                            self.__chain.is_export_func(attr,self.__name),
+                            self.__export_trivial_obj)
     @magic_meth_chained("{_var} = str({_self})",export=True)
     def __str__(self): pass
     @magic_meth_chained("{_var} = repr({_self})",export=True)
@@ -561,6 +585,16 @@ class ProxiedObj:
                 and not attr.startswith("_ProxiedObj"):
             raise AttributeError # 改用__getattr__
         return result
+    def __new__(cls,*args,**kw):
+        if len(args) >= 3:
+            target_obj = args[2]
+        elif "target_obj" in kw:
+            target_obj = kw["target_obj"]
+        else:
+            target_obj = EMPTY_OBJ
+        if _isinstance(target_obj, ProxiedObj):
+            return target_obj # 避免重复包装对象，提高性能
+        return object.__new__(cls)
 
     # 算术运算符
     @magic_meth_chained("{_var} = {_self} + {!r}")
@@ -712,7 +746,8 @@ class ProxiedObj:
     @magic_meth_chained(default_fmt=True,export=True)
     def __fspath__(self):pass
 
-from pyobject.objproxy.builtin_hook import hook_builtins
+_isinstance = isinstance
+from pyobject.objproxy.builtin_hook import hook_builtins # pylint: disable=ungrouped-imports
 hook_builtins() # hook内置函数
 
 def proxy_demo():

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/objproxy/builtin_hook.py

@@ -1,5 +1,5 @@
-# 内置函数和少数标准库函数的hook
-import builtins,_collections_abc
+# 内置函数和部分标准库函数的hook
+import sys,builtins,_collections_abc,inspect
 import collections.abc as collections_abc
 from pyobject.objproxy import ProxiedObj,accept_raw_obj
 
@@ -14,7 +14,7 @@ def __build_class__(func, cls_name, *bases, metaclass=None, **kwds):
     chain = None
     dependency = []
     for i, cls in enumerate(bases):
-        if isinstance(cls, ProxiedObj):
+        if _isinstance(cls, ProxiedObj):
             bases[i] = cls._ProxiedObj__target_obj
             if chain is not None and cls._ProxiedObj__chain is not chain:
                 raise ValueError("base classes should be associated with the same chain")
@@ -40,7 +40,7 @@ _getattr = getattr
 def isinstance(obj, class_or_tuple):
     if _isinstance(class_or_tuple, ProxiedObj):
         class_or_tuple = class_or_tuple._ProxiedObj__target_obj
-    if _isinstance(class_or_tuple, tuple):
+    elif _isinstance(class_or_tuple, tuple):
         class_or_tuple = tuple(cls._ProxiedObj__target_obj \
             if _isinstance(cls, ProxiedObj) else cls \
             for cls in class_or_tuple)
@@ -52,6 +52,8 @@ def isinstance(obj, class_or_tuple):
         return _isinstance(obj, class_or_tuple) # 重新调用_isinstance
     return result
 def issubclass(cls, class_or_tuple):
+    if _isinstance(cls, ProxiedObj):
+        cls = cls._ProxiedObj__target_obj
     if _isinstance(class_or_tuple, ProxiedObj):
         class_or_tuple = class_or_tuple._ProxiedObj__target_obj
     if _issubclass(cls, ProxiedObj):
@@ -64,9 +66,9 @@ def callable(obj):
         obj = obj._ProxiedObj__target_obj
     return _callable(obj)
 def getattr(*args,**kw):
-    if isinstance(args[1],ProxiedObj):
+    if _isinstance(args[1],ProxiedObj):
         args = (args[0], args[1]._ProxiedObj__target_obj, *args[2:])
-    if "name" in kw and isinstance(kw["name"],ProxiedObj):
+    if "name" in kw and _isinstance(kw["name"],ProxiedObj):
         kw["name"] = kw["name"]._ProxiedObj__target_obj
     return _getattr(*args)
 
@@ -79,6 +81,51 @@ def _check_methods(Cls, *methods):
             return _pre_check_methods(object,*methods) # ProxiedObj继承自object
     return _pre_check_methods(Cls,*methods)
 
+_super=builtins.super
+class super(_super):
+    def __init__(self,*args):
+        # 模拟CPython typeobject.c中super()的行为
+        if not args:
+            frame = getattr(sys._getframe(),"f_back",None)
+            if frame is None:
+                raise RuntimeError("super(): no current frame")
+            code = frame.f_code
+            if code is None:
+                raise RuntimeError("super(): no code object")
+            if code.co_argcount == 0:
+                raise RuntimeError("super(): no arguments")
+            try:
+                self_ = frame.f_locals[code.co_varnames[0]]
+            except (IndexError, KeyError):
+                raise RuntimeError("super(): arg[0] deleted") from None
+            if "__class__" not in frame.f_locals:
+                raise RuntimeError("super(): bad __class__ cell")
+            cls = frame.f_locals["__class__"]
+            if not isinstance(cls, type):
+                raise RuntimeError("super(): __class__ is not a type (%s)" \
+                                   % type(cls).__name__)
+            args = (cls, self_)
+        args = tuple(item._ProxiedObj__target_obj if _issubclass(
+                     object.__getattribute__(item,"__class__"),
+                     ProxiedObj) else item for item in args) # 确保不为ProxiedObj
+        _super.__init__(self,*args)
+
+_signature = inspect.signature
+_getattr_static = inspect.getattr_static
+def signature(obj, **kw):
+    if _isinstance(obj, ProxiedObj):
+        obj = obj._ProxiedObj__target_obj
+    return _signature(obj, **kw)
+def getattr_static(obj, attr, *args, **kw):
+    if _isinstance(obj, ProxiedObj):
+        obj = obj._ProxiedObj__target_obj
+    if _isinstance(attr, ProxiedObj):
+        attr = attr._ProxiedObj__target_obj
+    if kw:
+        return _getattr_static(obj, attr, *args, **kw)
+    else:
+        return _getattr_static(obj, attr, *args)
+
 def hook_builtins():
     builtins.range=range
     builtins.__build_class__ = __build_class__
@@ -86,8 +133,11 @@ def hook_builtins():
     builtins.issubclass = issubclass
     builtins.callable = callable
     builtins.getattr = getattr
+    builtins.super = super
     _collections_abc._check_methods = _check_methods # 修改collections.abc库
     collections_abc._check_methods = _check_methods
+    inspect.signature = signature
+    inspect.getattr_static = getattr_static
 
 # 内置类型的修改（备用）
 class CustomStr(builtins.str):

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/objproxy/dynobj.py

@@ -82,7 +82,7 @@ def ck(obj,symbol):
 def magic_meth(meth): # 用于无法获知具体表达式的魔法方法调用（备用函数）
     @functools.wraps(meth)
     def override(self,*args,**kw):
-        return DynObj(f"{ck(self)}.{meth.__name__}") # 优先级使用默认的HIGHEST
+        return DynObj(f"{ck(self, HIGHEST)}.{meth.__name__}") # 优先级使用默认的HIGHEST
     return override
 
 # 能包装表达式链式求值的对象（不可变）
@@ -111,9 +111,9 @@ class DynObj:
         return self.__code
 
     # 算术运算符
-    def __add__(self, other): return DynObj(f"{ck(self,ADD)} + {ck(other,ADD)}",ADD)
-    def __sub__(self, other): return DynObj(f"{ck(self,SUB)} - {ck(other,SUB)}",SUB)
-    def __mul__(self, other): return DynObj(f"{ck(self,MUL)} * {ck(other,MUL)}",MUL)
+    def __add__(self, other): return DynObj(f"{ck(self, ADD)} + {ck(other,ADD)}",ADD)
+    def __sub__(self, other): return DynObj(f"{ck(self, SUB)} - {ck(other,SUB)}",SUB)
+    def __mul__(self, other): return DynObj(f"{ck(self, MUL)} * {ck(other,MUL)}",MUL)
     def __truediv__(self, other):
         return DynObj(f"{ck(self, DIV)} / {ck(other, DIV)}", DIV)
     def __floordiv__(self, other):

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/objproxy/optimize.py

@@ -4,10 +4,10 @@ from pyobject.objproxy.utils import *
 MERGABLE_INFO = ["_alias_name"]
 
 class Statement: # 图节点（一条语句）
-    def __init__(self,graph,code,var,dependency_vars,extra_info=None):
+    def __init__(self,graph,code,varname,dependency_vars,extra_info=None):
         self.graph = graph
         self.code = code
-        self.var = var
+        self.var = varname
         self.extra_info = extra_info or {}
         self.removed = False
         self.depends = set()
@@ -39,7 +39,8 @@ class Statement: # 图节点（一条语句）
                 self.var = None
             except NotAssignmentError:pass # 不是赋值语句
             if remove_internal and self.extra_info.get("_internal",False)\
-               or remove_export_type and self.extra_info.get("_export_type",False):
+                    or remove_export_type and self.extra_info.get("_export_type",False)\
+                    or self.extra_info.get("_optional_stat",False):
                 for dep in self.depends:
                     dep.affects.remove(self)
                     dep.affects_cnt -= 1
@@ -100,7 +101,7 @@ def import_optimizer(graph):
         try:
             stat.code = optimize_import(stat.code)
         except NotAnImportError:pass
-        
+
     graph.clear_removed_statements()
 
 def import_alias_optimizer(graph):
@@ -153,4 +154,4 @@ unused_var = submod.func(temp_var)"""
             [("submod",[]),("temp_var",[]),
              ("unused_var",["submod","temp_var"])]), sep="")
 
-if __name__=="__main__":test()
+if __name__=="__main__":test()

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/objproxy/utils.py

@@ -109,4 +109,4 @@ def optimize_import(source):
 
     # 构建导入语句
     alias = assign_node.targets[0].id
-    return f"import {module_name} as {alias}"
+    return f"import {module_name} as {alias}"

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/pyobj_extension.c

@@ -73,7 +73,7 @@ PyDoc_STRVAR(setrefcount_nogil_doc, u8"setrefcount_nogil(obj,ref_data)\n"
 #define _PY312P /* 3.12+所有版本 */
 #endif
 
-// 临时在posix禁用python 3.12+特性
+// TODO: 临时在posix禁用python 3.12+特性
 #ifndef _WIN32
 #ifdef _PY312
 #undef _PY312

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject/tests/test_objproxy.py

@@ -62,7 +62,7 @@ class TestObjChain(unittest.TestCase):
         class Cls2:pass
         chain = ObjChain()
         obj = chain.add_existing_obj(Cls(),"obj")
-        self.assertTrue(issubclass(type(obj), Cls)) # 有pyobj_extension模块时测试才成功
+        self.assertTrue(issubclass(type(obj), Cls))
         self.assertFalse(issubclass(type(obj), Cls2))
         self.assertTrue(isinstance(obj, Cls))
         self.assertFalse(isinstance(obj, Cls2))

pyobject-1.2.9.2/pyobject/tests/test_objproxy_perf.py

@@ -0,0 +1,49 @@
+from time import perf_counter
+import random
+try:
+    from pyobject import ObjChain, ProxiedObj
+except ImportError:
+    path = __file__
+    for i in range(3):
+        path = os.path.split(path)[0]
+    sys.path.append(path) # 加入当前pyobject库所在的目录
+    from pyobject import ObjChain, ProxiedObj
+
+REPEAT_TIMES = 20000
+
+def test_perf(use_objchain=True):
+    chain = ObjChain(export_trivial_obj=False)
+    class Cls:
+        def __init__(self, value=None):
+            self.attr = value
+        def meth(self):
+            return self.attr
+        __call__ = meth
+        def __add__(self, other):
+            return Cls(other)
+
+    if use_objchain:
+        Cls = chain.add_existing_obj(Cls,"Cls")
+
+    obj1, obj2 = Cls(1), Cls(42)
+    obj1.attr, obj2.attr = obj2, obj1
+    start = perf_counter()
+    for _ in range(REPEAT_TIMES):
+        op = random.randint(0,3)
+        if op == 0:
+            new_obj = obj1 + obj2
+            obj1, obj2 = obj2, new_obj
+        elif op == 1:
+            new_obj = obj1.attr
+            obj1, obj2 = obj2, new_obj
+        elif op == 2:
+            new_obj = obj1() #obj1.meth()
+            obj1, obj2 = obj2, new_obj
+        elif op == 3:
+            obj1.attr = obj1
+    print(f"use_objchain={use_objchain}: {perf_counter()-start:.9f}s")
+
+if __name__=="__main__":
+    print(f"REPEAT_TIMES={REPEAT_TIMES}")
+    test_perf(True)
+    test_perf(False)

{pyobject-1.2.9 → pyobject-1.2.9.2/pyobject.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyobject
-Version: 1.2.9
+Version: 1.2.9.2
 Summary: A multifunctional all-in-one utility tool for managing internal Python objects, compatible with nearly all Python 3 versions. 一个多功能合一的提供操作Python对象底层工具的Python包, 支持几乎所有Python 3版本。 
 Home-page: https://github.com/qfcy/pyobject
 Author: qfcy
@@ -351,7 +351,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
    unused_var = func(temp_var)
 
 | 代码中\ ``temp_var``\ 只有一条指向\ ``unused_var``\ 的边，而\ ``unused_var``\ 没有任何指出的边。
-| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，并去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
+| 将\ ``temp_var``\ 的值代入\ ``func(temp_var)``\ 进行内联，得到\ ``unused_var = func([1,2,3])``\ ，再去掉\ ``unused_var``\ ，优化后的代码会变成\ ``func([1,2,3])``\ 。
 
 模块\ ``pyobject.pyobj_extension``
 ----------------------------------
@@ -394,7 +394,7 @@ Python内部的字节码对象\ ``CodeType``\ ，如\ ``func.__code__``\ ，是
 lst调用多次==运算符(``__eq__``)相比，
 本函数直接比较对象的指针，提高了效率。
 
-**``pyobject``\ 当前版本**: 1.2.9
+**``pyobject``\ 当前版本**: 1.2.9.2
 
 更新日志:
 ---------
@@ -829,9 +829,9 @@ Implementation Details
 
 | Here, ``temp_var`` only has one edge pointing to ``unused_var``, while
   ``unused_var`` does not point to any other node.
-| By inlining the value of ``temp_var`` into ``func(temp_var)`` and
-  removing ``unused_var``, the optimized code becomes
-  ``func([1, 2, 3])``.
+| By inlining the value of ``temp_var`` into ``func(temp_var)``, the
+  code becomes ``unused_var = func([1,2,3])``. After removing
+  ``unused_var``, the optimized code is ``func([1, 2, 3])``.
 
 Module: ``pyobj_extension``
 ---------------------------
@@ -886,7 +886,7 @@ Python call “obj in lst” that invokes the “==” operator (``__eq__``)
 multiple times, this function directly compares the pointers to improve
 efficiency.
 
-**Current Version of ``pyobject``**: 1.2.9
+**Current Version of ``pyobject``**: 1.2.9.2
 
 Change Log
 ----------

{pyobject-1.2.9 → pyobject-1.2.9.2}/pyobject.egg-info/SOURCES.txt

@@ -40,4 +40,5 @@ pyobject/objproxy/optimize.py
 pyobject/objproxy/utils.py
 pyobject/other/browser_chs_locale.py
 pyobject/tests/test_code.py
-pyobject/tests/test_objproxy.py
+pyobject/tests/test_objproxy.py
+pyobject/tests/test_objproxy_perf.py