Changeset 69561 in vbox for trunk/src/VBox

Timestamp:

Nov 3, 2017 11:46:58 AM (7 years ago)

Author:

vboxsync

Message:

testdriver/vbox.py: pylint

File:

• trunk/src/VBox/ValidationKit/testdriver/vbox.py (modified) (9 diffs)

trunk/src/VBox/ValidationKit/testdriver/vbox.py

@@ -584 +584 @@
                     if not fPassive:
                         if sys.platform == 'win32':
-                            from win32com.server.util import unwrap # pylint: disable=F0401
+                            from win32com.server.util import unwrap # pylint: disable=import-error
                             oRet = unwrap(oRet);
                         oRet.oListener = oListener;
@@ -1279 +1279 @@
 
         try:
-            # pylint: disable=F0401
+            # pylint: disable=import-error
             from vboxapi import VirtualBoxManager
             if self.sHost == 'win':
@@ -1287 +1287 @@
                 from xpcom import Exception     as NativeComExceptionClass
                 from xpcom import nsError       as NativeComErrorClass
-            # pylint: enable=F0401
+            # pylint: enable=import-error
         except:
             traceback.print_exc();
@@ -1362 +1362 @@
         if self.sHost == 'win':
             try:
-                import pythoncom;           # pylint: disable=F0401
+                import pythoncom;           # pylint: disable=import-error
                 pythoncom.CoInitializeEx(0);   # pylint: disable=no-member
                 pythoncom.CoInitializeEx(0);   # pylint: disable=no-member
@@ -1383 +1383 @@
             if oXcpt is None: oXcpt = sys.exc_info()[1];
             if sys.platform == 'win32':
-                import winerror;                                            # pylint: disable=F0401
+                import winerror;                                            # pylint: disable=import-error
                 hrXcpt = oXcpt.hresult;
                 if hrXcpt == winerror.DISP_E_EXCEPTION:
@@ -1408 +1408 @@
             if oXcpt is None: oXcpt = sys.exc_info()[1];
             if sys.platform == 'win32':
-                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=F0401,E0611
+                from pythoncom import com_error as NativeComExceptionClass  # pylint: disable=import-error,E0611
             else:
-                from xpcom import Exception     as NativeComExceptionClass  # pylint: disable=F0401
+                from xpcom import Exception     as NativeComExceptionClass  # pylint: disable=import-error
             return isinstance(oXcpt, NativeComExceptionClass);
 
@@ -1471 +1471 @@
         if self.sHost == 'win':
             try:
-                import pythoncom;                       # pylint: disable=F0401
+                import pythoncom;                       # pylint: disable=import-error
                 cIfs  = pythoncom._GetInterfaceCount(); # pylint: disable=no-member,protected-access
                 cObjs = pythoncom._GetGatewayCount();   # pylint: disable=no-member,protected-access
@@ -1478 +1478 @@
                 else:
                     reporter.log('actionCleanupAfter: Python COM still has %s objects and %s interfaces...' % ( cObjs, cIfs));
-                    from win32com.client import DispatchBaseClass;
+                    from win32com.client import DispatchBaseClass; # pylint: disable=import-error
                     for oObj in gc.get_objects():
                         if isinstance(oObj, DispatchBaseClass):
@@ -1487 +1487 @@
         else:
             try:
-                from xpcom import _xpcom as _xpcom;     # pylint: disable=F0401
+                from xpcom import _xpcom as _xpcom;     # pylint: disable=import-error
                 hrc   = _xpcom.NS_ShutdownXPCOM();
                 cIfs  = _xpcom._GetInterfaceCount();    # pylint: disable=W0212