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

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/webui

Files:

• wuiadminfailurecategory.py (modified) (1 diff)
• wuibase.py (modified) (2 diffs)
• wuicontentbase.py (modified) (3 diffs)
• wuigraphwiz.py (modified) (1 diff)
• wuihlpform.py (modified) (2 diffs)
• wuihlpgraphmatplotlib.py (modified) (2 diffs)
• wuitestresultfailure.py (modified) (1 diff)

trunk/src/VBox/ValidationKit/testmanager/webui/wuiadminfailurecategory.py

@@ -47 +47 @@
                            dParams = { WuiAdmin.ksParamAction: WuiAdmin.ksActionFailureCategoryDetails,
                                        FailureCategoryData.ksParam_idFailureCategory: idFailureCategory, },
-                           fBracketed = fBracketed);
+                           fBracketed = fBracketed,
+                           sTitle = sTitle);
         self.idFailureCategory = idFailureCategory;
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuibase.py

@@ -42 +42 @@
 from testmanager.core.systemlog   import SystemLogLogic, SystemLogData;
 from testmanager.core.useraccount import UserAccountLogic
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
+    long = int;     # pylint: disable=redefined-builtin,invalid-name
 
 
@@ -280 +285 @@
         if self._dSideMenuFormAttrs:
             dReplacements['@@SIDE_MENU_FORM_ATTRS@@'] = ' '.join(['%s="%s"' % (sKey, webutils.escapeAttr(sValue))
-                                                                  for sKey, sValue in self._dSideMenuFormAttrs.iteritems()]);
+                                                                  for sKey, sValue in self._dSideMenuFormAttrs.items()]);
 
         # Special current user handling.

trunk/src/VBox/ValidationKit/testmanager/webui/wuicontentbase.py

@@ -32 +32 @@
 # Standard python imports.
 import copy;
+import sys;
 
 # Validation Kit imports.
@@ -40 +41 @@
 from testmanager.core               import db;
 from testmanager.core.base          import AttributeChangeEntryPre;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
 
 
@@ -691 +696 @@
             if self._sRedirectTo is not None:
                 oForm.addTextHidden(self._oDisp.ksParamRedirectTo, self._sRedirectTo);
-        except WuiException, oXcpt:
+        except WuiException as oXcpt:
             sContent = unicode(oXcpt)
         else:

trunk/src/VBox/ValidationKit/testmanager/webui/wuigraphwiz.py

@@ -104 +104 @@
                 else:
                     daTestBoxes[oSeries.idTestBox] = [oSeries,];
-            for _, aoSeriesPerTestBox in daTestBoxes.iteritems():
+            for aoSeriesPerTestBox in daTestBoxes.values():
                 if len(aoSeriesPerTestBox) >= 0:
                     asOsArches = aoSeriesPerTestBox[0].oBuildCategory.asOsArches;

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpform.py

@@ -31 +31 @@
 # Standard python imports.
 import copy;
+import sys;
 
 # Validation Kit imports.
@@ -39 +40 @@
 from testmanager.core.testcaseargs  import TestCaseArgsData;
 from testmanager.core.testgroup     import TestGroupMemberData, TestGroupDataEx;
+
+# Python 3 hacks:
+if sys.version_info[0] >= 3:
+    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
 
 

trunk/src/VBox/ValidationKit/testmanager/webui/wuihlpgraphmatplotlib.py

@@ -31 +31 @@
 # Standard Python Import and extensions installed on the system.
 import re;
-import StringIO;
-
-import matplotlib;                          # pylint: disable=F0401
+import sys;
+if sys.version_info[0] >= 3:
+    from io       import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
+else:
+    from StringIO import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
+
+import matplotlib;                              # pylint: disable=F0401
 matplotlib.use('Agg'); # Force backend.
-import matplotlib.pyplot;                   # pylint: disable=F0401
-from numpy import arange as numpy_arange;   # pylint: disable=E0611,E0401
+import matplotlib.pyplot;                       # pylint: disable=F0401
+from numpy import arange as numpy_arange;       # pylint: disable=E0611,E0401
 
 # Validation Kit imports.
@@ -70 +74 @@
     def _produceSvg(self, oFigure, fTightLayout = True):
         """ Creates an SVG string from the given figure. """
-        oOutput = StringIO.StringIO();
+        oOutput = StringIO();
         if fTightLayout:
             oFigure.tight_layout();

trunk/src/VBox/ValidationKit/testmanager/webui/wuitestresultfailure.py

@@ -48 +48 @@
                            dParams = { WuiMain.ksParamAction: WuiMain.ksActionTestResultFailureDetails,
                                        TestResultFailureData.ksParam_idTestResult: idTestResult, },
-                           fBracketed = fBracketed);
+                           fBracketed = fBracketed,
+                           sTitle = sTitle);
         self.idTestResult = idTestResult;