diff -r c4b5f3393d63 -r c1af2e327675 eric6/Preferences/ProgramsDialog.py
--- a/eric6/Preferences/ProgramsDialog.py Tue Sep 24 18:45:33 2019 +0200
+++ b/eric6/Preferences/ProgramsDialog.py Tue Sep 24 18:46:24 2019 +0200
@@ -14,8 +14,9 @@
from PyQt5.QtCore import pyqtSlot, Qt, QProcess
from PyQt5.QtGui import QCursor
-from PyQt5.QtWidgets import QApplication, QTreeWidgetItem, QHeaderView, \
- QDialog, QDialogButtonBox
+from PyQt5.QtWidgets import (
+ QApplication, QTreeWidgetItem, QHeaderView, QDialog, QDialogButtonBox
+)
from E5Gui.E5Application import e5App
@@ -82,9 +83,11 @@
# 1. do the Qt5 programs
# 1a. Translation Converter
- exe = Utilities.isWindowsPlatform() and \
- "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or \
+ exe = (
+ Utilities.isWindowsPlatform() and
+ "{0}.exe".format(Utilities.generateQtToolName("lrelease")) or
Utilities.generateQtToolName("lrelease")
+ )
exe = os.path.join(Utilities.getQtBinariesPath(), exe)
version = self.__createProgramEntry(
self.tr("Translation Converter (Qt)"), exe, '-version',
@@ -363,10 +366,12 @@
else:
exe = Utilities.getExecutablePath(exe)
if exe:
- if versionCommand and \
- (versionStartsWith != "" or
- (versionRe is not None and versionRe != "")) and \
- versionPosition:
+ if (
+ versionCommand and
+ (versionStartsWith != "" or
+ (versionRe is not None and versionRe != "")) and
+ versionPosition
+ ):
proc = QProcess()
proc.setProcessChannelMode(QProcess.MergedChannels)
if exeModule:
@@ -379,10 +384,13 @@
output = str(proc.readAllStandardOutput(),
Preferences.getSystem("IOEncoding"),
'replace')
- if exeModule and exeModule[0] == "-m" and \
+ if (
+ exeModule and
+ exeModule[0] == "-m" and
("ImportError:" in output or
"ModuleNotFoundError:" in output or
- proc.exitCode() != 0):
+ proc.exitCode() != 0)
+ ):
version = self.tr("(module not found)")
else:
if versionRe is None:
