diff -r aff39db4dacc -r 7c017076c12e eric6/PyUnit/UnittestDialog.py
--- a/eric6/PyUnit/UnittestDialog.py Mon Sep 23 19:10:42 2019 +0200
+++ b/eric6/PyUnit/UnittestDialog.py Mon Sep 23 19:22:12 2019 +0200
@@ -16,8 +16,10 @@
from PyQt5.QtCore import pyqtSignal, QEvent, Qt, pyqtSlot
from PyQt5.QtGui import QColor
-from PyQt5.QtWidgets import QWidget, QDialog, QApplication, QDialogButtonBox, \
- QListWidgetItem, QComboBox, QTreeWidgetItem
+from PyQt5.QtWidgets import (
+ QWidget, QDialog, QApplication, QDialogButtonBox, QListWidgetItem,
+ QComboBox, QTreeWidgetItem
+)
from E5Gui.E5Application import e5App
from E5Gui import E5MessageBox
@@ -286,15 +288,17 @@
Private slot called before the test suite selection dialog is shown.
"""
if self.__dbs:
- py2Extensions = \
- ' '.join(["*{0}".format(ext)
- for ext in self.__dbs.getExtensions('Python2')])
- py3Extensions = \
- ' '.join(["*{0}".format(ext)
- for ext in self.__dbs.getExtensions('Python3')])
+ py2Extensions = ' '.join(
+ ["*{0}".format(ext)
+ for ext in self.__dbs.getExtensions('Python2')]
+ )
+ py3Extensions = ' '.join(
+ ["*{0}".format(ext)
+ for ext in self.__dbs.getExtensions('Python3')]
+ )
fileFilter = self.tr(
- "Python3 Files ({1});;Python2 Files ({0});;All Files (*)")\
- .format(py2Extensions, py3Extensions)
+ "Python3 Files ({1});;Python2 Files ({0});;All Files (*)"
+ ).format(py2Extensions, py3Extensions)
else:
fileFilter = self.tr("Python Files (*.py);;All Files (*)")
self.testsuitePicker.setFilters(fileFilter)
@@ -403,8 +407,7 @@
return
workdir = ""
- clientType = \
- self.__venvManager.getVirtualenvVariant(venvName)
+ clientType = self.__venvManager.getVirtualenvVariant(venvName)
if not clientType:
# assume Python 3
clientType = "Python3"
@@ -423,8 +426,10 @@
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
@@ -440,8 +445,7 @@
try:
testLoader = unittest.TestLoader()
test = testLoader.discover(discoveryStart)
- if hasattr(testLoader, "errors") and \
- bool(testLoader.errors):
+ if hasattr(testLoader, "errors") and bool(testLoader.errors):
E5MessageBox.critical(
self,
self.tr("Unittest"),
@@ -494,9 +498,11 @@
testCases.extend(self.__assembleTestCasesList(test, start))
else:
testId = test.id()
- if "ModuleImportFailure" not in testId and \
- "LoadTestsFailure" not in testId and \
- "_FailedTest" not in testId:
+ if (
+ "ModuleImportFailure" not in testId and
+ "LoadTestsFailure" not in testId and
+ "_FailedTest" not in testId
+ ):
filename = os.path.join(
start,
test.__module__.replace(".", os.sep) + ".py")
@@ -548,8 +554,10 @@
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] == \
- itm.text(0):
+ if (
+ os.path.splitext(os.path.basename(filename))[0] ==
+ itm.text(0)
+ ):
itm.setData(0, UnittestDialog.TestCaseFileRole,
filename)
elif pitm:
@@ -748,8 +756,8 @@
coverageFile = os.path.join(discoveryStart, "unittest")
workdir = ""
- clientType = \
- self.__venvManager.getVirtualenvVariant(venvName)
+ clientType = self.__venvManager.getVirtualenvVariant(
+ venvName)
if not clientType:
# assume Python 3
clientType = "Python3"
@@ -757,10 +765,12 @@
mainScript = os.path.abspath(testFileName)
flags = Utilities.extractFlagsFromFile(mainScript)
workdir = os.path.dirname(mainScript)
- if mainScript.endswith(
- tuple(Preferences.getPython("PythonExtensions"))) or \
- ("FileType" in flags and
- flags["FileType"] in ["Python", "Python2"]):
+ if (
+ mainScript.endswith(tuple(
+ Preferences.getPython("PythonExtensions"))) or
+ ("FileType" in flags and
+ flags["FileType"] in ["Python", "Python2"])
+ ):
clientType = "Python2"
else:
# if it is not Python2 it must be Python3!
@@ -769,8 +779,8 @@
else:
coverageFile = os.path.abspath("unittest")
workdir = ""
- clientType = \
- self.__venvManager.getVirtualenvVariant(venvName)
+ clientType = self.__venvManager.getVirtualenvVariant(
+ venvName)
if not clientType:
# assume Python 3
clientType = "Python3"
@@ -802,11 +812,15 @@
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
@@ -868,8 +882,8 @@
if discover:
covname = os.path.join(discoveryStart, "unittest")
elif testFileName:
- covname = \
- os.path.splitext(os.path.abspath(testFileName))[0]
+ covname = os.path.splitext(
+ os.path.abspath(testFileName))[0]
else:
covname = "unittest"
