Changeset 79139 in vbox

Timestamp:

Jun 14, 2019 1:00:56 AM (6 years ago)

Author:

vboxsync

Message:

Main/vboxapi.py: Prefer S_OK and the E_XXXX style constants over the XPCOM ones in xcptToString().

File:

• trunk/src/VBox/Main/glue/vboxapi.py (modified) (1 diff)

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

@@ -1223 +1223 @@
                     if type(oValue) is int:
                         dErrorValToName[oValue] = sKey
+            # Always prefer the COM names (see aliasing in platform specific code):
+            for sKey in ('S_OK', 'E_FAIL', 'E_ABORT', 'E_POINTER', 'E_NOINTERFACE', 'E_INVALIDARG',
+                         'E_OUTOFMEMORY', 'E_NOTIMPL', 'E_UNEXPECTED',):
+                oValue = getattr(self.statuses, sKey, None)
+                if oValue is not None:
+                    dErrorValToName[oValue] = sKey
             self._dErrorValToName = dErrorValToName