eric: comparison eric6/PyUnit/UnittestDialog.py

-:aff39db4dacc
+:7c017076c12e
 import re
 import os
 from PyQt5.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
 from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QWidget, QDialog, QApplication, QDialogButtonBox, \
+from PyQt5.QtWidgets import (
-QListWidgetItem, QComboBox, QTreeWidgetItem
+QWidget, QDialog, QApplication, QDialogButtonBox, QListWidgetItem,
+QComboBox, QTreeWidgetItem
+)
 from E5Gui.E5Application import e5App
 from E5Gui import E5MessageBox
 from E5Gui.E5MainWindow import E5MainWindow
 from E5Gui.E5PathPicker import E5PathPickerModes
 def on_testsuitePicker_aboutToShowPathPickerDialog(self):
 """
 Private slot called before the test suite selection dialog is shown.
 """
 if self.__dbs:
-py2Extensions = \
+py2Extensions = ' '.join(
-' '.join(["*{0}".format(ext)
+["*{0}".format(ext)
-for ext in self.__dbs.getExtensions('Python2')])
+for ext in self.__dbs.getExtensions('Python2')]
-py3Extensions = \
+)
-' '.join(["*{0}".format(ext)
+py3Extensions = ' '.join(
-for ext in self.__dbs.getExtensions('Python3')])
+["*{0}".format(ext)
+for ext in self.__dbs.getExtensions('Python3')]
+)
 fileFilter = self.tr(
-"Python3 Files ({1});;Python2 Files ({0});;All Files (*)")\
+"Python3 Files ({1});;Python2 Files ({0});;All Files (*)"
-.format(py2Extensions, py3Extensions)
+).format(py2Extensions, py3Extensions)
 else:
 fileFilter = self.tr("Python Files (*.py);;All Files (*)")
 self.testsuitePicker.setFilters(fileFilter)
 defaultDirectory = Preferences.getMultiProject("Workspace")
 self.tr("You must enter a start directory for"
 " auto-discovery."))
 return
 workdir = ""
-clientType = \
+clientType = self.__venvManager.getVirtualenvVariant(venvName)
-self.__venvManager.getVirtualenvVariant(venvName)
 if not clientType:
 # assume Python 3
 clientType = "Python3"
 sysPath = []
 self.__dbs.remoteUTDiscover(clientType, self.__forProject,
 self.tr("You must enter a start directory for"
 " auto-discovery."))
 return
 if discoveryStart:
-sys.path = [os.path.abspath(discoveryStart)] + \
+sys.path = (
+[os.path.abspath(discoveryStart)] +
 self.savedSysPath
+)
 # clean up list of imported modules to force a reimport upon
 # running the test
 if self.savedModulelist:
 for modname in list(sys.modules.keys()):
 # now try to discover the testsuite
 os.chdir(discoveryStart)
 try:
 testLoader = unittest.TestLoader()
 test = testLoader.discover(discoveryStart)
-if hasattr(testLoader, "errors") and \
+if hasattr(testLoader, "errors") and bool(testLoader.errors):
-bool(testLoader.errors):
 E5MessageBox.critical(
 self,
 self.tr("Unittest"),
 self.tr(
 "<p>Unable to discover tests.</p>"
 for test in suite:
 if isinstance(test, unittest.TestSuite):
 testCases.extend(self.__assembleTestCasesList(test, start))
 else:
 testId = test.id()
-if "ModuleImportFailure" not in testId and \
+if (
-"LoadTestsFailure" not in testId and \
+"ModuleImportFailure" not in testId and
-"_FailedTest" not in testId:
+"LoadTestsFailure" not in testId and
+"_FailedTest" not in testId
+):
 filename = os.path.join(
 start,
 test.__module__.replace(".", os.sep) + ".py")
 testCases.append(
 (test.id(), test.shortDescription(), filename)
 [testPath[index - 1]])
 pitm.setExpanded(True)
 itm.setFlags(Qt.ItemIsUserCheckable | Qt.ItemIsEnabled)
 itm.setCheckState(0, Qt.Unchecked)
 itm.setData(0, UnittestDialog.TestCaseNameRole, modulePath)
-if os.path.splitext(os.path.basename(filename))[0] == \
+if (
-itm.text(0):
+os.path.splitext(os.path.basename(filename))[0] ==
+itm.text(0)
+):
 itm.setData(0, UnittestDialog.TestCaseFileRole,
 filename)
 elif pitm:
 fn = pitm.data(0, UnittestDialog.TestCaseFileRole)
 if fn:
 " auto-discovery."))
 return
 coverageFile = os.path.join(discoveryStart, "unittest")
 workdir = ""
-clientType = \
+clientType = self.__venvManager.getVirtualenvVariant(
-self.__venvManager.getVirtualenvVariant(venvName)
+venvName)
 if not clientType:
 # assume Python 3
 clientType = "Python3"
 elif testFileName:
 mainScript = os.path.abspath(testFileName)
 flags = Utilities.extractFlagsFromFile(mainScript)
 workdir = os.path.dirname(mainScript)
-if mainScript.endswith(
+if (
-tuple(Preferences.getPython("PythonExtensions"))) or \
+mainScript.endswith(tuple(
-("FileType" in flags and
+Preferences.getPython("PythonExtensions"))) or
-flags["FileType"] in ["Python", "Python2"]):
+("FileType" in flags and
+flags["FileType"] in ["Python", "Python2"])
+):
 clientType = "Python2"
 else:
 # if it is not Python2 it must be Python3!
 clientType = "Python3"
 coverageFile = os.path.splitext(mainScript)[0]
 else:
 coverageFile = os.path.abspath("unittest")
 workdir = ""
-clientType = \
+clientType = self.__venvManager.getVirtualenvVariant(
-self.__venvManager.getVirtualenvVariant(venvName)
+venvName)
 if not clientType:
 # assume Python 3
 clientType = "Python3"
 sysPath = []
 if failedOnly and self.__failedTests:
 self.tr("You must enter a start directory for"
 " auto-discovery."))
 return
 if testFileName:
-sys.path = [os.path.dirname(os.path.abspath(testFileName))] + \
+sys.path = (
+[os.path.dirname(os.path.abspath(testFileName))] +
 self.savedSysPath
+)
 elif discoveryStart:
-sys.path = [os.path.abspath(discoveryStart)] + \
+sys.path = (
+[os.path.abspath(discoveryStart)] +
 self.savedSysPath
+)
 # clean up list of imported modules to force a reimport upon
 # running the test
 if self.savedModulelist:
 for modname in list(sys.modules.keys()):
 # now set up the coverage stuff
 if self.coverageCheckBox.isChecked():
 if discover:
 covname = os.path.join(discoveryStart, "unittest")
 elif testFileName:
-covname = \
+covname = os.path.splitext(
-os.path.splitext(os.path.abspath(testFileName))[0]
+os.path.abspath(testFileName))[0]
 else:
 covname = "unittest"
 from DebugClients.Python.coverage import coverage
 cover = coverage(data_file="{0}.coverage".format(covname))

Mercurial Repositories > eric / file comparison

comparison: eric6/PyUnit/UnittestDialog.py

eric6/PyUnit/UnittestDialog.py