Changeset 103329 in vbox

Timestamp:

Feb 13, 2024 1:33:35 AM (10 months ago)

Author:

vboxsync

Message:

Main/vboxapi.py: Fixed regression in PerfCollector.query(). g_curXcptClass shall not start with a 'cur', but either 'Cur' or 'oCur'. Simplified the _g_dCOMForward setup again. bugref:10579

File:

• trunk/src/VBox/Main/glue/python/vboxapi.py (modified) (7 diffs)

trunk/src/VBox/Main/glue/python/vboxapi.py

@@ -147 +147 @@
              indices, lengths) = self.collector.queryMetricsData(names, objects)
         out = []
-        for i in enumerate(names_out):
+        for i, _ in enumerate(names_out):
             scale = int(scales[i])
             if scale != 1:
@@ -473 +473 @@
         # Hack the COM dispatcher base class so we can modify method and
         # attribute names to match those in xpcom.
-        if 'getattr' not in _g_dCOMForward:
-            _g_dCOMForward['getattr'] = DispatchBaseClass.__dict__['__getattr__']
+        if 'setattr' not in _g_dCOMForward:
+            _g_dCOMForward['getattr'] = DispatchBaseClass.__dict__['__getattr__'] # before setattr which we test for.
+            _g_dCOMForward['setattr'] = DispatchBaseClass.__dict__['__setattr__']
             setattr(DispatchBaseClass, '__getattr__', _CustomGetAttr)
-
-        if 'setattr' not in _g_dCOMForward:
-            _g_dCOMForward['setattr'] = DispatchBaseClass.__dict__['__setattr__']
             setattr(DispatchBaseClass, '__setattr__', _CustomSetAttr)
 
@@ -586 +584 @@
 
     def createListener(self, oImplClass, dArgs):
+        _ = oImplClass; _ = dArgs;
         raise Exception('no active listeners on Windows as PyGatewayBase::QueryInterface() '
                         'returns new gateway objects all the time, thus breaking EventQueue '
@@ -769 +768 @@
         notDocumentedDict['BaseClass'] = oImplClass
         notDocumentedDict['dArgs'] = dArgs
-        sEval = ""
+        sEval  = ""
         sEval += "import xpcom.components\n"
         sEval += "class ListenerImpl(BaseClass):\n"
@@ -902 +901 @@
         notDocumentedDict = {}
         notDocumentedDict['oIUnknown'] = oIUnknown
-        sEval = ""
+        sEval  = ""
         sEval += "from VirtualBox_wrappers import " + sClassName + "\n"
         sEval += "result = " + sClassName + "(oIUnknown.mgr, oIUnknown.handle)\n"
@@ -943 +942 @@
 # This is reinitalized whenever VirtualBoxManager is called, so it will hold
 # the reference to the error exception class for the last platform/style that
-# was used.  Most clients does talk to multiple VBox instance on different
+# was used.  Most clients does not talk to multiple VBox instance on different
 # platforms at the same time, so this should be sufficent for most uses and
 # be way simpler to use than VirtualBoxManager::oXcptClass.
-g_curXcptClass = None
+g_oCurXcptClass = None
 
 
@@ -1005 +1004 @@
         ## The exception class for the selected platform.
         self.oXcptClass = self.platform.xcptGetBaseXcpt()
-        global g_curXcptClass
-        g_curXcptClass = self.oXcptClass
+        global g_oCurXcptClass
+        g_oCurXcptClass = self.oXcptClass
 
         # Get the virtualbox singleton.