Changeset 70660 in vbox for trunk/src/VBox/ValidationKit/testmanager/core

Timestamp:

Jan 21, 2018 4:18:58 PM (7 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

120396

Message:

ValidationKit: Python 3 and pylint 1.8.1 adjustments/fixes.

Location:

trunk/src/VBox/ValidationKit/testmanager/core

Files:

• db.py (modified) (1 diff)
• failurecategory.py (modified) (1 diff)
• failurereason.py (modified) (2 diffs)
• report.py (modified) (2 diffs)
• schedulerbase.py (modified) (5 diffs)
• testbox.py (modified) (2 diffs)
• testcase.py (modified) (4 diffs)
• testresultfailures.py (modified) (2 diffs)
• testresults.py (modified) (2 diffs)
• webservergluebase.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/core/db.py

@@ -45 +45 @@
     psycopg2.extensions.register_type(psycopg2.extensions.UNICODE);
     psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY);
+else:
+    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
+
 
 

trunk/src/VBox/ValidationKit/testmanager/core/failurecategory.py

@@ -30 +30 @@
 
 
+# Standard Python imports.
+import sys;
+
 # Validation Kit imports.
 from testmanager.core.base          import ModelDataBase, ModelLogicBase, TMRowInUse, TMInvalidData, TMRowNotFound, \
                                            ChangeLogEntry, AttributeChangeEntry;
 from testmanager.core.useraccount   import UserAccountLogic;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/failurereason.py

@@ -30 +30 @@
 
 
+# Standard Python imports.
+import sys;
+
 # Validation Kit imports.
 from testmanager.core.base              import ModelDataBase, ModelLogicBase, TMRowNotFound, TMInvalidData, TMRowInUse, \
@@ -35 +38 @@
 from testmanager.core.useraccount       import UserAccountLogic;
 
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/report.py

@@ -29 +29 @@
 __version__ = "$Revision$"
 
+
+# Standard Python imports.
+import sys;
 
 # Validation Kit imports.
@@ -40 +43 @@
 from testmanager.core.testresults   import TestResultLogic, TestResultFilter;
 from common                         import constants;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/schedulerbase.py

@@ -33 +33 @@
 
 # Standard python imports.
+import sys;
 import unittest;
 
@@ -49 +50 @@
 from testmanager.core.testcaseargs      import TestCaseArgsDataEx, TestCaseArgsLogic;
 from testmanager.core.testset           import TestSetData, TestSetLogic;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
+
 
 
@@ -303 +309 @@
 
 
-        return True;
-
-
 
 class SchedQueueData(ModelDataBase):
@@ -420 +423 @@
                 return self;
 
-            def next(self):
+            def __next__(self):
                 """Returns the next build, raises StopIteration when the end has been reached."""
                 while True:
@@ -432 +435 @@
                     if not oEntry.fRemoved:
                         return oEntry;
-                # end
+                return None; # not reached, but make pylint happy (for now).
+
+            def next(self):
+                """ For python 2.x. """
+                return self.__next__();
 
         class BuildCacheEntry(object):

trunk/src/VBox/ValidationKit/testmanager/core/testbox.py

@@ -32 +32 @@
 # Standard python imports.
 import copy;
+import sys;
 import unittest;
 
@@ -40 +41 @@
                                            ChangeLogEntry, AttributeChangeEntry, AttributeChangeEntryPre;
 from testmanager.core.useraccount   import UserAccountLogic;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/testcase.py

@@ -33 +33 @@
 # Standard python imports.
 import copy;
+import sys;
 import unittest;
 
@@ -41 +42 @@
 from testmanager.core.globalresource    import GlobalResourceData;
 from testmanager.core.useraccount       import UserAccountLogic;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
 
 
@@ -872 +877 @@
                         oTestCase.idTestCase = int(oTestCase.idTestCase);
                         oTestCase.initFromDbWithId(oDb, oTestCase.idTestCase);
-                    except Exception, oXcpt:
+                    except Exception as oXcpt:
                         asErrors.append('Test case dependency #%s: %s' % (oTestCase.idTestCase, oXcpt));
                 aoNewValues.append(oTestCase);
@@ -883 +888 @@
                         oGlobalRsrc.idTestCase = int(oGlobalRsrc.idGlobalRsrc);
                         oGlobalRsrc.initFromDbWithId(oDb, oGlobalRsrc.idGlobalRsrc);
-                    except Exception, oXcpt:
+                    except Exception as oXcpt:
                         asErrors.append('Resource dependency #%s: %s' % (oGlobalRsrc.idGlobalRsrc, oXcpt));
                 aoNewValues.append(oGlobalRsrc);

trunk/src/VBox/ValidationKit/testmanager/core/testresultfailures.py

@@ -31 +31 @@
 """
 __version__ = "$Revision$"
+
 # Standard python imports.
+import sys;
 import unittest;
 
@@ -40 +42 @@
 from testmanager.core.useraccount   import UserAccountLogic;
 
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    xrange = range; # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/testresults.py

@@ -31 +31 @@
 """
 __version__ = "$Revision$"
+
+
 # Standard python imports.
+import sys;
 import unittest;
 
@@ -49 +52 @@
 from testmanager.core.testresultfailures    import TestResultFailureDataEx;
 from testmanager.core.useraccount           import UserAccountLogic;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/core/webservergluebase.py

@@ -546 +546 @@
         dInfo['sys.hexversion']             = sys.hexversion;
         dInfo['sys.api_version']            = sys.api_version;
-        dInfo['sys.subversion']             = sys.subversion;
+        if hasattr(sys, 'subversion'):
+            dInfo['sys.subversion']         = sys.subversion;   # pylint: disable=no-member
         dInfo['sys.platform']               = sys.platform;
         dInfo['sys.executable']             = sys.executable;