diff -r fb0ef164f536 -r 698ae46f40a4 eric6/Project/ProjectFormsBrowser.py
--- a/eric6/Project/ProjectFormsBrowser.py Fri Apr 02 11:59:41 2021 +0200
+++ b/eric6/Project/ProjectFormsBrowser.py Sat May 01 14:27:20 2021 +0200
@@ -10,6 +10,7 @@
import os
import sys
import shutil
+import contextlib
from PyQt5.QtCore import QThread, QFileInfo, pyqtSignal, QProcess
from PyQt5.QtWidgets import QDialog, QInputDialog, QApplication, QMenu
@@ -390,7 +391,7 @@
self.__pyuicDirMultiConfigAct.setEnabled(enable)
self.__pyuicBackConfigAct.setEnabled(enable)
- try:
+ with contextlib.suppress(Exception):
categories = self.getSelectedItemsCountCategorized(
[ProjectBrowserFileItem, ProjectBrowserSimpleDirectoryItem])
cnt = categories["sum"]
@@ -420,8 +421,6 @@
self.backMenu.popup(self.mapToGlobal(coord))
else:
self.backMenu.popup(self.mapToGlobal(coord))
- except Exception: # secok
- pass
def __showContextMenu(self):
"""
@@ -501,15 +500,13 @@
"""
itmList = self.getSelectedItems()
for itm in itmList[:]:
- try:
+ with contextlib.suppress(Exception):
if isinstance(itm, ProjectBrowserFileItem):
# hook support
if self.hooks["open"] is not None:
self.hooks["open"](itm.fileName())
else:
self.designerFile.emit(itm.fileName())
- except Exception: # secok
- pass
def __openFileInEditor(self):
"""
@@ -684,15 +681,12 @@
self.__resetUiCompiler()
if self.project.getProjectLanguage() == "Python3":
- if self.project.getProjectType() in ["PyQt5"]:
+ if self.project.getProjectType() in ["PyQt5", "E6Plugin"]:
self.__uicompiler = Utilities.generatePyQtToolPath(
'pyuic5', ["py3uic5"])
elif self.project.getProjectType() in ["PyQt6"]:
self.__uicompiler = Utilities.generatePyQtToolPath(
'pyuic6')
- elif self.project.getProjectType() in ["E6Plugin"]:
- self.__uicompiler = Utilities.generatePyQtToolPath(
- 'pyuic5', ["py3uic5"])
elif self.project.getProjectType() == "PySide2":
self.__uicompiler = Utilities.generatePySideToolPath(
'pyside2-uic', variant=2)
@@ -760,10 +754,8 @@
):
ofn = os.path.join(self.project.ppath, self.compiledFile)
try:
- if self.project.useSystemEol():
- newline = None
- else:
- newline = self.project.getEolString()
+ newline = (None if self.project.useSystemEol()
+ else self.project.getEolString())
with open(ofn, "w", encoding="utf-8", newline=newline) as f:
for line in self.buf.splitlines():
f.write(line + "\n")
@@ -782,14 +774,14 @@
self.tr(
"<p>The compilation of the form file failed.</p>"
"<p>Reason: {0}</p>").format(str(msg)),
- kind=NotificationTypes.Critical,
+ kind=NotificationTypes.CRITICAL,
timeout=0)
else:
ui.showNotification(
UI.PixmapCache.getPixmap("designer48"),
self.tr("Form Compilation"),
self.tr("The compilation of the form file failed."),
- kind=NotificationTypes.Critical,
+ kind=NotificationTypes.CRITICAL,
timeout=0)
self.compileProc = None
@@ -932,10 +924,9 @@
progress.setModal(True)
progress.setMinimumDuration(0)
progress.setWindowTitle(self.tr("Forms"))
- i = 0
- for fn in self.project.pdata["FORMS"]:
- progress.setValue(i)
+ for prog, fn in enumerate(self.project.pdata["FORMS"]):
+ progress.setValue(prog)
if progress.wasCanceled():
break
@@ -947,8 +938,6 @@
QApplication.processEvents()
else:
break
- i += 1
-
progress.setValue(numForms)
def __compileSelectedForms(self):
@@ -970,10 +959,9 @@
progress.setModal(True)
progress.setMinimumDuration(0)
progress.setWindowTitle(self.tr("Forms"))
- i = 0
- for fn in files:
- progress.setValue(i)
+ for prog, fn in enumerate(files):
+ progress.setValue(prog)
if progress.wasCanceled():
break
@@ -985,8 +973,6 @@
QApplication.processEvents()
else:
break
- i += 1
-
progress.setValue(numForms)
def compileChangedForms(self):
@@ -1007,13 +993,12 @@
self.tr("Abort"), 0, 100, self.tr("%v/%m Forms"))
progress.setMinimumDuration(0)
progress.setWindowTitle(self.tr("Forms"))
- i = 0
# get list of changed forms
changedForms = []
progress.setMaximum(len(self.project.pdata["FORMS"]))
- for fn in self.project.pdata["FORMS"]:
- progress.setValue(i)
+ for prog, fn in enumerate(self.project.pdata["FORMS"]):
+ progress.setValue(prog)
QApplication.processEvents()
ifn = os.path.join(self.project.ppath, fn)
@@ -1027,19 +1012,17 @@
os.stat(ifn).st_mtime > os.stat(ofn).st_mtime
):
changedForms.append(fn)
- i += 1
- progress.setValue(i)
+ progress.setValue(len(self.project.pdata["FORMS"]))
QApplication.processEvents()
if changedForms:
progress.setLabelText(
self.tr("Compiling changed forms..."))
progress.setMaximum(len(changedForms))
- i = 0
- progress.setValue(i)
+ progress.setValue(prog)
QApplication.processEvents()
- for fn in changedForms:
- progress.setValue(i)
+ for prog, fn in enumerate(changedForms):
+ progress.setValue(prog)
if progress.wasCanceled():
break
@@ -1051,7 +1034,6 @@
QApplication.processEvents()
else:
break
- i += 1
progress.setValue(len(changedForms))
QApplication.processEvents()
