VirtualBox

Ignore:
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
Files:
26 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/ValidationKit/testmanager/batch/add_build.py

    r69111 r70660  
    3434import sys;
    3535import os;
    36 from optparse import OptionParser;
     36from optparse import OptionParser;  # pylint: disable=deprecated-module
    3737
    3838# Add Test Manager's modules path

  • trunk/src/VBox/ValidationKit/testmanager/batch/check_for_deleted_builds.py

    r69111 r70660  
    1212bisecting problems.
    1313"""
     14
     15from __future__ import print_function;
    1416
    1517__copyright__ = \
    … …  
    3941import sys;
    4042import os;
    41 from optparse import OptionParser;
     43from optparse import OptionParser;  # pylint: disable=deprecated-module
    4244
    4345# Add Test Manager's modules path
    … …  
    4850from testmanager.core.db    import TMDatabaseConnection;
    4951from testmanager.core.build import BuildLogic;
     52
     53
    5054
    5155class BuildChecker(object): # pylint: disable=R0903
    … …  
    7074        if not self.oConfig.fQuiet:
    7175            if not self.oConfig.fRealRun:
    72                 print 'Dry run.';
     76                print('Dry run.');
    7377            else:
    74                 print 'Real run! Will commit findings!';
     78                print('Real run! Will commit findings!');
    7579
    7680
    … …  
    8892            aoBuilds = oBuildLogic.fetchForListing(iStart, cMaxRows, tsNow);
    8993            if not self.oConfig.fQuiet and aoBuilds:
    90                 print 'Processing builds #%s thru #%s' % (aoBuilds[0].idBuild, aoBuilds[-1].idBuild);
     94                print('Processing builds #%s thru #%s' % (aoBuilds[0].idBuild, aoBuilds[-1].idBuild));
    9195
    9296            for oBuild in aoBuilds:
    … …  
    9599                    if rc is False:
    96100                        if not self.oConfig.fQuiet:
    97                             print 'missing files for build #%s / r%s / %s / %s / %s / %s / %s' \
    98                                 % (oBuild.idBuild, oBuild.iRevision, oBuild.sVersion, oBuild.oCat.sType,
    99                                    oBuild.oCat.sBranch, oBuild.oCat.sProduct, oBuild.oCat.asOsArches,);
    100                             print '  %s' % (oBuild.sBinaries,);
     101                            print('missing files for build #%s / r%s / %s / %s / %s / %s / %s'
     102                                  % (oBuild.idBuild, oBuild.iRevision, oBuild.sVersion, oBuild.oCat.sType,
     103                                     oBuild.oCat.sBranch, oBuild.oCat.sProduct, oBuild.oCat.asOsArches,));
     104                            print('  %s' % (oBuild.sBinaries,));
    101105                        if self.oConfig.fRealRun is True:
    102106                            oBuild.fBinariesDeleted = True;
    103107                            oBuildLogic.editEntry(oBuild, fCommit = True);
    104108                    elif rc is True and not self.oConfig.fQuiet:
    105                         print 'build #%s still have its files' % (oBuild.idBuild,);
     109                        print('build #%s still have its files' % (oBuild.idBuild,));
    106110                    elif rc is None and not self.oConfig.fQuiet:
    107                         print 'Unable to determine state of build #%s' % (oBuild.idBuild,);
     111                        print('Unable to determine state of build #%s' % (oBuild.idBuild,));
    108112
    109113            # advance

  • trunk/src/VBox/ValidationKit/testmanager/batch/close_orphaned_testsets.py

    r69111 r70660  
    77Maintenance tool for closing orphaned testsets.
    88"""
     9
     10from __future__ import print_function;
    911
    1012__copyright__ = \
    … …  
    3436import sys
    3537import os
    36 from optparse import OptionParser
     38from optparse import OptionParser;  # pylint: disable=deprecated-module
    3739
    3840# Add Test Manager's modules path
    … …  
    7274            # Complete them.
    7375            if self.oConfig.fJustDoIt:
    74                 print 'Completing %u test sets as abandoned:' % (len(aoOrphans),);
     76                print('Completing %u test sets as abandoned:' % (len(aoOrphans),));
    7577                for oTestSet in aoOrphans:
    76                     print '#%-7u: idTestBox=%-3u tsCreated=%s tsDone=%s' \
    77                         % (oTestSet.idTestSet, oTestSet.idTestBox, oTestSet.tsCreated, oTestSet.tsDone);
     78                    print('#%-7u: idTestBox=%-3u tsCreated=%s tsDone=%s'
     79                          % (oTestSet.idTestSet, oTestSet.idTestBox, oTestSet.tsCreated, oTestSet.tsDone));
    7880                    oLogic.completeAsAbandoned(oTestSet.idTestSet);
    79                 print 'Committing...';
     81                print('Committing...');
    8082                oDb.commit();
    8183            else:
    8284                for oTestSet in aoOrphans:
    83                     print '#%-7u: idTestBox=%-3u tsCreated=%s tsDone=%s' \
    84                         % (oTestSet.idTestSet, oTestSet.idTestBox, oTestSet.tsCreated, oTestSet.tsDone);
    85                 print 'Not completing any testsets without seeing the --just-do-it option.'
     85                    print('#%-7u: idTestBox=%-3u tsCreated=%s tsDone=%s'
     86                          % (oTestSet.idTestSet, oTestSet.idTestBox, oTestSet.tsCreated, oTestSet.tsDone));
     87                print('Not completing any testsets without seeing the --just-do-it option.');
    8688        else:
    87             print 'No orphaned test sets.\n'
     89            print('No orphaned test sets.\n');
    8890        return 0;
    8991

  • trunk/src/VBox/ValidationKit/testmanager/batch/del_build.py

    r69111 r70660  
    88deleted.
    99"""
     10
     11from __future__ import print_function;
    1012
    1113__copyright__ = \
    … …  
    3537import sys
    3638import os
    37 from optparse import OptionParser
     39from optparse import OptionParser;  # pylint: disable=deprecated-module
    3840
    3941# Add Test Manager's modules path
    … …  
    7476        else:
    7577            if not oConfig.fQuiet:
    76                 print "del_build.py: Marked %u builds associated with '%s' as deleted." % (cBuilds, sBuildBin,);
     78                print("del_build.py: Marked %u builds associated with '%s' as deleted." % (cBuilds, sBuildBin,));
    7779
    7880    oDb.close()

  • trunk/src/VBox/ValidationKit/testmanager/batch/filearchiver.py

    r69111 r70660  
    88g_ksZipFileAreaRootDir storage area.
    99"""
     10
     11from __future__ import print_function;
    1012
    1113__copyright__ = \
    … …  
    3537import sys
    3638import os
    37 from optparse import OptionParser
     39from optparse import OptionParser;  # pylint: disable=deprecated-module
    3840import time;
    3941import zipfile;
    … …  
    4850from testmanager.core.db        import TMDatabaseConnection;
    4951from testmanager.core.testset   import TestSetData, TestSetLogic;
     52
     53
    5054
    5155class FileArchiverBatchJob(object): # pylint: disable=R0903
    … …  
    6872        """ Verbose output. """
    6973        if self.fVerbose:
    70             print sText;
     74            print(sText);
    7175        return True;
    7276
    7377    def warning(self, sText):
    7478        """Prints a warning."""
    75         print sText;
     79        print(sText);
    7680        return True;
    7781

  • trunk/src/VBox/ValidationKit/testmanager/batch/regen_sched_queues.py

    r69111 r70660  
    77Interface used by the admin to regenerate scheduling queues.
    88"""
     9
     10from __future__ import print_function;
    911
    1012__copyright__ = \
    … …  
    3436import sys;
    3537import os;
    36 from optparse import OptionParser;
     38from optparse import OptionParser;  # pylint: disable=deprecated-module
    3739
    3840# Add Test Manager's modules path
    … …  
    4446from testmanager.core.schedulerbase import SchedulerBase;
    4547from testmanager.core.schedgroup    import SchedGroupLogic;
     48
     49
    4650
    4751class RegenSchedQueues(object): # pylint: disable=R0903
    … …  
    7680        for oGroup in aoGroups:
    7781            if not self.oConfig.fQuiet:
    78                 print '%s (ID %#d):' % (oGroup.sName, oGroup.idSchedGroup,);
     82                print('%s (ID %#d):' % (oGroup.sName, oGroup.idSchedGroup,));
    7983            try:
    8084                (aoErrors, asMessages) = SchedulerBase.recreateQueue(oDb, self.oConfig.uid, oGroup.idSchedGroup, 2);
    8185            except Exception as oXcpt:
    8286                oDb.rollback();
    83                 print '  !!Hit exception processing "%s": %s' % (oGroup.sName, oXcpt,);
     87                print('  !!Hit exception processing "%s": %s' % (oGroup.sName, oXcpt,));
    8488            else:
    8589                if not aoErrors:
    8690                    if not self.oConfig.fQuiet:
    87                         print '  Successfully regenerated.';
     91                        print('  Successfully regenerated.');
    8892                else:
    8993                    iRc = 1;
    90                     print '  %d errors:' % (len(aoErrors,));
     94                    print('  %d errors:' % (len(aoErrors,)));
    9195                    for oError in aoErrors:
    9296                        if oError[1]  is None:
    93                             print '  !!%s' % (oError[0],);
     97                            print('  !!%s' % (oError[0],));
    9498                        else:
    95                             print '  !!%s (%s)' % (oError[0], oError[1]);
     99                            print('  !!%s (%s)' % (oError[0], oError[1]));
    96100                if asMessages and not self.oConfig.fQuiet:
    97                     print '  %d messages:' % (len(asMessages),);
     101                    print('  %d messages:' % (len(asMessages),));
    98102                    for sMsg in asMessages:
    99                         print '  ##%s' % (sMsg,);
     103                        print('  ##%s' % (sMsg,));
    100104        return iRc;
    101105

  • trunk/src/VBox/ValidationKit/testmanager/batch/vcs_import.py

    r69111 r70660  
    77Cron job for importing revision history for a repository.
    88"""
     9
     10from __future__ import print_function;
    911
    1012__copyright__ = \
    … …  
    3436import sys;
    3537import os;
    36 from optparse import OptionParser;
     38from optparse import OptionParser; # pylint: disable=deprecated-module
    3739import xml.etree.ElementTree as ET;
    3840
    … …  
    111113        asArgs.append(self.oConfig.sUrl);
    112114        if not self.oConfig.fQuiet:
    113             print 'Executing: %s' % (asArgs,);
     115            print('Executing: %s' % (asArgs,));
    114116        sLogXml = utils.processOutputChecked(asArgs);
    115117
    … …  
    127129                sMessage = ' ';
    128130            if not self.oConfig.fQuiet:
    129                 print 'sDate=%s iRev=%u sAuthor=%s sMsg[%s]=%s' % (sDate, iRevision, sAuthor, type(sMessage).__name__, sMessage);
     131                print('sDate=%s iRev=%u sAuthor=%s sMsg[%s]=%s' % (sDate, iRevision, sAuthor, type(sMessage).__name__, sMessage));
    130132            oData = VcsRevisionData().initFromValues(self.oConfig.sRepository, iRevision, sDate, sAuthor, sMessage);
    131133            oLogic.addVcsRevision(oData);

  • trunk/src/VBox/ValidationKit/testmanager/batch/virtual_test_sheriff.py

    r69111 r70660  
    1212
    1313"""
     14
     15from __future__ import print_function;
    1416
    1517__copyright__ = \
    … …  
    4143import os;
    4244import hashlib;
    43 import StringIO;
    44 from optparse import OptionParser;
    45 from PIL import Image;                  # pylint: disable=import-error
     45if sys.version_info[0] >= 3:
     46    from io       import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
     47else:
     48    from StringIO import StringIO as StringIO;      # pylint: disable=import-error,no-name-in-module
     49from optparse import OptionParser;                  # pylint: disable=deprecated-module
     50from PIL import Image;                              # pylint: disable=import-error
    4651
    4752# Add Test Manager's modules path
    … …  
    6065from testmanager.core.testresultfailures    import TestResultFailureLogic, TestResultFailureData;
    6166from testmanager.core.useraccount           import UserAccountLogic;
     67
     68# Python 3 hacks:
     69if sys.version_info[0] >= 3:
     70    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    6271
    6372
    … …  
    224233        else:
    225234            try:
    226                 oImage = Image.open(StringIO.StringIO(abImageFile));
     235                oImage = Image.open(StringIO(abImageFile));
    227236            except Exception as oXcpt:
    228237                self.oSheriff.vprint(u'Error opening the "%s" image bytes using PIL.Image.open: %s' % (oFile.sFile, oXcpt,))
    … …  
    302311        Returns 1 (for exit code usage.)
    303312        """
    304         print 'error: %s' % (sText,);
     313        print('error: %s' % (sText,));
    305314        if self.oLogFile is not None:
    306315            self.oLogFile.write((u'error: %s\n' % (sText,)).encode('utf-8'));
    … …  
    313322        if self.oConfig.fDebug:
    314323            if not self.oConfig.fQuiet:
    315                 print 'debug: %s' % (sText, );
     324                print('debug: %s' % (sText, ));
    316325            if self.oLogFile is not None:
    317326                self.oLogFile.write((u'debug: %s\n' % (sText,)).encode('utf-8'));
    … …  
    323332        """
    324333        if not self.oConfig.fQuiet:
    325             print 'info: %s' % (sText,);
     334            print('info: %s' % (sText,));
    326335        if self.oLogFile is not None:
    327336            self.oLogFile.write((u'info: %s\n' % (sText,)).encode('utf-8'));

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

    r69111 r70660  
    4545    psycopg2.extensions.register_type(psycopg2.extensions.UNICODE);
    4646    psycopg2.extensions.register_type(psycopg2.extensions.UNICODEARRAY);
     47else:
     48    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
     49
    4750
    4851

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

    r69111 r70660  
    3030
    3131
     32# Standard Python imports.
     33import sys;
     34
    3235# Validation Kit imports.
    3336from testmanager.core.base          import ModelDataBase, ModelLogicBase, TMRowInUse, TMInvalidData, TMRowNotFound, \
    3437                                           ChangeLogEntry, AttributeChangeEntry;
    3538from testmanager.core.useraccount   import UserAccountLogic;
     39
     40# Python 3 hacks:
     41if sys.version_info[0] >= 3:
     42    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    3643
    3744

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

    r69111 r70660  
    3030
    3131
     32# Standard Python imports.
     33import sys;
     34
    3235# Validation Kit imports.
    3336from testmanager.core.base              import ModelDataBase, ModelLogicBase, TMRowNotFound, TMInvalidData, TMRowInUse, \
    … …  
    3538from testmanager.core.useraccount       import UserAccountLogic;
    3639
     40# Python 3 hacks:
     41if sys.version_info[0] >= 3:
     42    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    3743
    3844

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

    r69111 r70660  
    2929__version__ = "$Revision$"
    3030
     31
     32# Standard Python imports.
     33import sys;
    3134
    3235# Validation Kit imports.
    … …  
    4043from testmanager.core.testresults   import TestResultLogic, TestResultFilter;
    4144from common                         import constants;
     45
     46# Python 3 hacks:
     47if sys.version_info[0] >= 3:
     48    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    4249
    4350

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

    r69111 r70660  
    3333
    3434# Standard python imports.
     35import sys;
    3536import unittest;
    3637
    … …  
    4950from testmanager.core.testcaseargs      import TestCaseArgsDataEx, TestCaseArgsLogic;
    5051from testmanager.core.testset           import TestSetData, TestSetLogic;
     52
     53# Python 3 hacks:
     54if sys.version_info[0] >= 3:
     55    xrange = range; # pylint: disable=redefined-builtin,invalid-name
     56
    5157
    5258
    … …  
    303309
    304310
    305         return True;
    306 
    307 
    308311
    309312class SchedQueueData(ModelDataBase):
    … …  
    420423                return self;
    421424
    422             def next(self):
     425            def __next__(self):
    423426                """Returns the next build, raises StopIteration when the end has been reached."""
    424427                while True:
    … …  
    432435                    if not oEntry.fRemoved:
    433436                        return oEntry;
    434                 # end
     437                return None; # not reached, but make pylint happy (for now).
     438
     439            def next(self):
     440                """ For python 2.x. """
     441                return self.__next__();
    435442
    436443        class BuildCacheEntry(object):

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

    r69111 r70660  
    3232# Standard python imports.
    3333import copy;
     34import sys;
    3435import unittest;
    3536
    … …  
    4041                                           ChangeLogEntry, AttributeChangeEntry, AttributeChangeEntryPre;
    4142from testmanager.core.useraccount   import UserAccountLogic;
     43
     44# Python 3 hacks:
     45if sys.version_info[0] >= 3:
     46    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    4247
    4348

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

    r69111 r70660  
    3333# Standard python imports.
    3434import copy;
     35import sys;
    3536import unittest;
    3637
    … …  
    4142from testmanager.core.globalresource    import GlobalResourceData;
    4243from testmanager.core.useraccount       import UserAccountLogic;
     44
     45# Python 3 hacks:
     46if sys.version_info[0] >= 3:
     47    long = int;     # pylint: disable=redefined-builtin,invalid-name
    4348
    4449
    … …  
    872877                        oTestCase.idTestCase = int(oTestCase.idTestCase);
    873878                        oTestCase.initFromDbWithId(oDb, oTestCase.idTestCase);
    874                     except Exception, oXcpt:
     879                    except Exception as oXcpt:
    875880                        asErrors.append('Test case dependency #%s: %s' % (oTestCase.idTestCase, oXcpt));
    876881                aoNewValues.append(oTestCase);
    … …  
    883888                        oGlobalRsrc.idTestCase = int(oGlobalRsrc.idGlobalRsrc);
    884889                        oGlobalRsrc.initFromDbWithId(oDb, oGlobalRsrc.idGlobalRsrc);
    885                     except Exception, oXcpt:
     890                    except Exception as oXcpt:
    886891                        asErrors.append('Resource dependency #%s: %s' % (oGlobalRsrc.idGlobalRsrc, oXcpt));
    887892                aoNewValues.append(oGlobalRsrc);

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

    r69111 r70660  
    3131"""
    3232__version__ = "$Revision$"
     33
    3334# Standard python imports.
     35import sys;
    3436import unittest;
    3537
    … …  
    4042from testmanager.core.useraccount   import UserAccountLogic;
    4143
     44# Python 3 hacks:
     45if sys.version_info[0] >= 3:
     46    xrange = range; # pylint: disable=redefined-builtin,invalid-name
    4247
    4348

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

    r69111 r70660  
    3131"""
    3232__version__ = "$Revision$"
     33
     34
    3335# Standard python imports.
     36import sys;
    3437import unittest;
    3538
    … …  
    4952from testmanager.core.testresultfailures    import TestResultFailureDataEx;
    5053from testmanager.core.useraccount           import UserAccountLogic;
     54
     55# Python 3 hacks:
     56if sys.version_info[0] >= 3:
     57    long = int;     # pylint: disable=redefined-builtin,invalid-name
    5158
    5259

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

    r69111 r70660  
    546546        dInfo['sys.hexversion']             = sys.hexversion;
    547547        dInfo['sys.api_version']            = sys.api_version;
    548         dInfo['sys.subversion']             = sys.subversion;
     548        if hasattr(sys, 'subversion'):
     549            dInfo['sys.subversion']         = sys.subversion;   # pylint: disable=no-member
    549550        dInfo['sys.platform']               = sys.platform;
    550551        dInfo['sys.executable']             = sys.executable;

  • trunk/src/VBox/ValidationKit/testmanager/debug/cgiprofiling.py

    r69111 r70660  
    5252    try:
    5353        oProfiler.print_stats(sort = sSort);
    54     except Exception, oXcpt:
     54    except Exception as oXcpt:
    5555        print('<p><pre>%s</pre></p>\n' % (oXcpt,));
    5656    else:

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

    r69111 r70660  
    4747                           dParams = { WuiAdmin.ksParamAction: WuiAdmin.ksActionFailureCategoryDetails,
    4848                                       FailureCategoryData.ksParam_idFailureCategory: idFailureCategory, },
    49                            fBracketed = fBracketed);
     49                           fBracketed = fBracketed,
     50                           sTitle = sTitle);
    5051        self.idFailureCategory = idFailureCategory;
    5152

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

    r69111 r70660  
    4242from testmanager.core.systemlog   import SystemLogLogic, SystemLogData;
    4343from testmanager.core.useraccount import UserAccountLogic
     44
     45# Python 3 hacks:
     46if sys.version_info[0] >= 3:
     47    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
     48    long = int;     # pylint: disable=redefined-builtin,invalid-name
    4449
    4550
    … …  
    280285        if self._dSideMenuFormAttrs:
    281286            dReplacements['@@SIDE_MENU_FORM_ATTRS@@'] = ' '.join(['%s="%s"' % (sKey, webutils.escapeAttr(sValue))
    282                                                                   for sKey, sValue in self._dSideMenuFormAttrs.iteritems()]);
     287                                                                  for sKey, sValue in self._dSideMenuFormAttrs.items()]);
    283288
    284289        # Special current user handling.

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

    r69111 r70660  
    3232# Standard python imports.
    3333import copy;
     34import sys;
    3435
    3536# Validation Kit imports.
    … …  
    4041from testmanager.core               import db;
    4142from testmanager.core.base          import AttributeChangeEntryPre;
     43
     44# Python 3 hacks:
     45if sys.version_info[0] >= 3:
     46    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
    4247
    4348
    … …  
    691696            if self._sRedirectTo is not None:
    692697                oForm.addTextHidden(self._oDisp.ksParamRedirectTo, self._sRedirectTo);
    693         except WuiException, oXcpt:
     698        except WuiException as oXcpt:
    694699            sContent = unicode(oXcpt)
    695700        else:

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

    r69111 r70660  
    104104                else:
    105105                    daTestBoxes[oSeries.idTestBox] = [oSeries,];
    106             for _, aoSeriesPerTestBox in daTestBoxes.iteritems():
     106            for aoSeriesPerTestBox in daTestBoxes.values():
    107107                if len(aoSeriesPerTestBox) >= 0:
    108108                    asOsArches = aoSeriesPerTestBox[0].oBuildCategory.asOsArches;

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

    r69111 r70660  
    3131# Standard python imports.
    3232import copy;
     33import sys;
    3334
    3435# Validation Kit imports.
    … …  
    3940from testmanager.core.testcaseargs  import TestCaseArgsData;
    4041from testmanager.core.testgroup     import TestGroupMemberData, TestGroupDataEx;
     42
     43# Python 3 hacks:
     44if sys.version_info[0] >= 3:
     45    unicode = str;  # pylint: disable=redefined-builtin,invalid-name
    4146
    4247

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

    r69111 r70660  
    3131# Standard Python Import and extensions installed on the system.
    3232import re;
    33 import StringIO;
    34 
    35 import matplotlib;                          # pylint: disable=F0401
     33import sys;
     34if sys.version_info[0] >= 3:
     35    from io       import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
     36else:
     37    from StringIO import StringIO as StringIO;  # pylint: disable=import-error,no-name-in-module
     38
     39import matplotlib;                              # pylint: disable=F0401
    3640matplotlib.use('Agg'); # Force backend.
    37 import matplotlib.pyplot;                   # pylint: disable=F0401
    38 from numpy import arange as numpy_arange;   # pylint: disable=E0611,E0401
     41import matplotlib.pyplot;                       # pylint: disable=F0401
     42from numpy import arange as numpy_arange;       # pylint: disable=E0611,E0401
    3943
    4044# Validation Kit imports.
    … …  
    7074    def _produceSvg(self, oFigure, fTightLayout = True):
    7175        """ Creates an SVG string from the given figure. """
    72         oOutput = StringIO.StringIO();
     76        oOutput = StringIO();
    7377        if fTightLayout:
    7478            oFigure.tight_layout();

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

    r69111 r70660  
    4848                           dParams = { WuiMain.ksParamAction: WuiMain.ksActionTestResultFailureDetails,
    4949                                       TestResultFailureData.ksParam_idTestResult: idTestResult, },
    50                            fBracketed = fBracketed);
     50                           fBracketed = fBracketed,
     51                           sTitle = sTitle);
    5152        self.idTestResult = idTestResult;
    5253
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette