Mercurial Repositories > eric / changeset
changeset
Changed calls to exec_() into exec() (remainder of Python2 elimination).
Tue, 06 Oct 2020 17:52:44 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 06 Oct 2020 17:52:44 +0200
- changeset 7759
- 51aa6c6b66f7
- parent 7758
- dd54d33d21d2
- child 7760
- fcd3322bf6ed
Changed calls to exec_() into exec() (remainder of Python2 elimination).
--- a/eric6/CondaInterface/Conda.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/CondaInterface/Conda.py Tue Oct 06 17:52:44 2020 +0200 @@ -67,7 +67,7 @@ dlg = CondaExecDialog("create", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, resultDict = dlg.getResult() if ok: @@ -390,7 +390,7 @@ dlg = CondaExecDialog("update", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, _ = dlg.getResult() else: ok = False @@ -430,7 +430,7 @@ dlg = CondaExecDialog("update", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, _ = dlg.getResult() return ok @@ -471,7 +471,7 @@ dlg = CondaExecDialog("install", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, _ = dlg.getResult() else: ok = False @@ -511,7 +511,7 @@ "Do you really want to uninstall these packages and" " their dependencies?"), packages) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: args = [ "remove", "--json", @@ -527,7 +527,7 @@ dlg = CondaExecDialog("remove", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, _ = dlg.getResult() else: ok = False @@ -623,7 +623,7 @@ dlg = CondaExecDialog("update", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec() ok, _ = dlg.getResult() return ok @@ -732,4 +732,4 @@ dlg = CondaExecDialog("clean", self.__ui) dlg.start(args) - dlg.exec_() + dlg.exec()
--- a/eric6/CondaInterface/CondaPackagesWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/CondaInterface/CondaPackagesWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -417,7 +417,7 @@ if details: from .CondaPackageDetailsWidget import CondaPackageDetailsDialog dlg = CondaPackageDetailsDialog(details, self) - dlg.exec_() + dlg.exec() @pyqtSlot(str) def on_searchEdit_textChanged(self, txt): @@ -549,7 +549,7 @@ from .CondaInfoDialog import CondaInfoDialog dlg = CondaInfoDialog(infoDict, self) - dlg.exec_() + dlg.exec() @pyqtSlot() def __installPackages(self): @@ -623,7 +623,7 @@ if prefix: dlg = CondaNewEnvironmentDataDialog(self.tr("Clone Environment"), False, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: virtEnvName, envName, _ = dlg.getData() args = [ "--name", @@ -647,7 +647,7 @@ dlg = CondaNewEnvironmentDataDialog(self.tr("Create Environment"), True, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: virtEnvName, envName, requirements = dlg.getData() args = [ "--name",
--- a/eric6/Debugger/BreakPointViewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Debugger/BreakPointViewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -238,7 +238,7 @@ dlg = EditBreakpointDialog((self.fnHistory[0], None), None, self.condHistory, self, modal=1, addMode=1, filenameHistory=self.fnHistory) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: fn, line, cond, temp, enabled, count = dlg.getAddData() if fn is not None: if fn in self.fnHistory: @@ -291,7 +291,7 @@ dlg = EditBreakpointDialog( (fn, line), (cond, temp, enabled, count), self.condHistory, self, modal=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, count = dlg.getData() if cond: if cond in self.condHistory:
--- a/eric6/Debugger/DebugUI.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Debugger/DebugUI.py Tue Oct 06 17:52:44 2020 +0200 @@ -1364,7 +1364,7 @@ dlg = EditBreakpointDialog( (fn, line), (cond, temp, enabled, count), [], self.ui, modal=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, count = dlg.getData() model.setBreakPointByIndex(index, fn, line, (cond, temp, enabled, count)) @@ -1398,7 +1398,7 @@ from .EditWatchpointDialog import EditWatchpointDialog dlg = EditWatchpointDialog( (cond, temp, enabled, count, special), self.ui) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, count, special = dlg.getData() # check for duplicates @@ -1433,7 +1433,7 @@ from .VariablesFilterDialog import VariablesFilterDialog dlg = VariablesFilterDialog(self.ui, 'Filter Dialog', True) dlg.setSelection(self.localsVarFilter, self.globalsVarFilter) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.localsVarFilter, self.globalsVarFilter = dlg.getSelection() self.debugViewer.setVariablesFilter( self.globalsVarFilter, self.localsVarFilter) @@ -1444,7 +1444,7 @@ """ from .ExceptionsFilterDialog import ExceptionsFilterDialog dlg = ExceptionsFilterDialog(self.excList, ignore=False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.excList = dlg.getExceptionsList()[:] # keep a copy def __configureIgnoredExceptions(self): @@ -1453,7 +1453,7 @@ """ from .ExceptionsFilterDialog import ExceptionsFilterDialog dlg = ExceptionsFilterDialog(self.excIgnoreList, ignore=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.excIgnoreList = dlg.getExceptionsList()[:] # keep a copy def __toggleBreakpoint(self): @@ -1575,7 +1575,7 @@ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory, self.envHistory, self.exceptions, self.ui, 2, autoClearShell=self.autoClearShell) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (lastUsedVenvName, argv, wd, env, exceptions, clearShell, console) = dlg.getData() eraseCoverage = dlg.getCoverageData() @@ -1710,7 +1710,7 @@ cap, self.lastUsedVenvName, self.argvHistory, self.wdHistory, self.envHistory, self.exceptions, self.ui, 3, autoClearShell=self.autoClearShell) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (lastUsedVenvName, argv, wd, env, exceptions, clearShell, console) = dlg.getData() eraseTimings = dlg.getProfilingData() @@ -1847,7 +1847,7 @@ autoClearShell=self.autoClearShell, autoFork=self.forkAutomatically, forkChild=self.forkIntoChild) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (lastUsedVenvName, argv, wd, env, exceptions, clearShell, console) = dlg.getData() forkAutomatically, forkIntoChild = dlg.getRunData() @@ -1986,7 +1986,7 @@ tracePython=self.tracePython, autoClearShell=self.autoClearShell, autoContinue=self.autoContinue, autoFork=self.forkAutomatically, forkChild=self.forkIntoChild) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (lastUsedVenvName, argv, wd, env, exceptions, clearShell, console) = dlg.getData() tracePython, autoContinue, forkAutomatically, forkIntoChild = (
--- a/eric6/Debugger/StartDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Debugger/StartDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -286,7 +286,7 @@ from .StartHistoryEditDialog import StartHistoryEditDialog dlg = StartHistoryEditDialog(history, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: history = dlg.getHistory() if historiesIndex == 1: combo = self.ui.cmdlineCombo
--- a/eric6/Debugger/VariablesViewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Debugger/VariablesViewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -1195,7 +1195,7 @@ # now show the dialog from .VariableDetailDialog import VariableDetailDialog dlg = VariableDetailDialog(name, vtype, val) - dlg.exec_() + dlg.exec() def __configure(self): """
--- a/eric6/Debugger/WatchPointViewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Debugger/WatchPointViewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -260,7 +260,7 @@ """ from .EditWatchpointDialog import EditWatchpointDialog dlg = EditWatchpointDialog(("", False, True, 0, ""), self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, ignorecount, special = dlg.getData() if not self.__findDuplicates(cond, special, True): self.__model.addWatchPoint(cond, special, @@ -302,7 +302,7 @@ from .EditWatchpointDialog import EditWatchpointDialog dlg = EditWatchpointDialog( (cond, temp, enabled, count, special), self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, count, special = dlg.getData() if not self.__findDuplicates(cond, special, True, sindex): self.__model.setWatchPointByIndex(
--- a/eric6/E5Gui/E5ErrorMessage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5ErrorMessage.py Tue Oct 06 17:52:44 2020 +0200 @@ -95,7 +95,7 @@ Globals.toList(_filterSettings.value( "MessageFilters", _defaultFilters)), _defaultFilters) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: filters = dlg.getFilters() _filterSettings.setValue("MessageFilters", filters)
--- a/eric6/E5Gui/E5FileSaveConfirmDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5FileSaveConfirmDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -143,5 +143,5 @@ """ dlg = E5FileSaveConfirmDialog(filename, title, message=message, picker=picker, parent=parent) - dlg.exec_() + dlg.exec() return dlg.selectedAction()
--- a/eric6/E5Gui/E5LineEditButton.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5LineEditButton.py Tue Oct 06 17:52:44 2020 +0200 @@ -69,7 +69,7 @@ """ if self.__menu: pos = self.mapToGlobal(QPoint(0, self.height())) - self.__menu.exec_(pos) + self.__menu.exec(pos) def paintEvent(self, evt): """
--- a/eric6/E5Gui/E5MessageBox.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5MessageBox.py Tue Oct 06 17:52:44 2020 +0200 @@ -133,7 +133,7 @@ messageBox.setText(text) messageBox.setStandardButtons(buttons) messageBox.setDefaultButton(defaultButton) - messageBox.exec_() + messageBox.exec() clickedButton = messageBox.clickedButton() if clickedButton is None: return QMessageBox.NoButton
--- a/eric6/E5Gui/E5ModelMenu.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5ModelMenu.py Tue Oct 06 17:52:44 2020 +0200 @@ -398,7 +398,7 @@ actionRect = self.actionGeometry(act) drag.setPixmap(self.grab(actionRect)) - if drag.exec_() == Qt.MoveAction: + if drag.exec() == Qt.MoveAction: row = idx.row() if self.__dropIndex == idx.parent() and self.__dropRow <= row: row += 1
--- a/eric6/E5Gui/E5ModelToolBar.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5ModelToolBar.py Tue Oct 06 17:52:44 2020 +0200 @@ -257,7 +257,7 @@ actionRect = self.actionGeometry(act) drag.setPixmap(self.grab(actionRect)) - if drag.exec_() == Qt.MoveAction: + if drag.exec() == Qt.MoveAction: row = idx.row() if self.__dropIndex == idx.parent() and self.__dropRow <= row: row += 1
--- a/eric6/E5Gui/E5PasswordMeter.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5PasswordMeter.py Tue Oct 06 17:52:44 2020 +0200 @@ -100,4 +100,4 @@ meter = E5PasswordMeter() meter.show() meter.checkPasswordStrength("Blah2+") - app.exec_() + app.exec()
--- a/eric6/E5Gui/E5PathPickerDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5PathPickerDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -151,7 +151,7 @@ dlg.setPickerFilters(";;".join(filters)) # step 2: show the dialog and get the result - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: ok = True path = dlg.getPath().strip() else:
--- a/eric6/E5Gui/E5TabWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5TabWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -95,7 +95,7 @@ mimeData.setData("action", b"tab-reordering") mimeData.setData("tabbar-id", str(id(self)).encode("utf-8")) drag.setMimeData(mimeData) - drag.exec_() + drag.exec() E5WheelTabBar.mouseMoveEvent(self, event) def dragEnterEvent(self, event):
--- a/eric6/E5Gui/E5TextInputDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Gui/E5TextInputDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -136,7 +136,7 @@ dlg.setTextValue(text) dlg.setMinimumWidth(minimumWidth) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: return True, dlg.textValue() else: return False, ""
--- a/eric6/E5Network/E5NetworkProxyFactory.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Network/E5NetworkProxyFactory.py Tue Oct 06 17:52:44 2020 +0200 @@ -57,7 +57,7 @@ from UI.AuthenticationDialog import AuthenticationDialog dlg = AuthenticationDialog(info, proxy.user(), True) dlg.setData(proxy.user(), proxy.password()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: username, password = dlg.getData() auth.setUser(username) auth.setPassword(password)
--- a/eric6/E5Network/E5SslCertificateSelectionDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Network/E5SslCertificateSelectionDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -121,7 +121,7 @@ self.certificatesTree.selectedItems()[0].data( 0, self.CertRole)) dlg = E5SslCertificatesInfoDialog(cert, self) - dlg.exec_() + dlg.exec() except ImportError: pass
--- a/eric6/E5Network/E5SslCertificatesDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Network/E5SslCertificatesDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -138,7 +138,7 @@ self.serversCertificatesTree.currentItem().data( 0, self.CertRole)) dlg = E5SslCertificatesInfoDialog(cert, self) - dlg.exec_() + dlg.exec() except ImportError: pass @@ -342,7 +342,7 @@ cert = QSslCertificate.fromData( self.caCertificatesTree.currentItem().data(0, self.CertRole)) dlg = E5SslCertificatesInfoDialog(cert, self) - dlg.exec_() + dlg.exec() except ImportError: pass
--- a/eric6/E5Network/E5SslInfoWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/E5Network/E5SslInfoWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -207,7 +207,7 @@ from .E5SslCertificatesInfoDialog import E5SslCertificatesInfoDialog dlg = E5SslCertificatesInfoDialog( self.__configuration.peerCertificateChain()) - dlg.exec_() + dlg.exec() def accept(self): """
--- a/eric6/Graphics/PixmapDiagram.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Graphics/PixmapDiagram.py Tue Oct 06 17:52:44 2020 +0200 @@ -320,7 +320,7 @@ printer.setPrinterName(Preferences.getPrinter("PrinterName")) printDialog = QPrintDialog(printer, self) - if printDialog.exec_(): + if printDialog.exec(): self.__print(printer) def __printPreviewDiagram(self): @@ -350,7 +350,7 @@ preview = QPrintPreviewDialog(printer, self) preview.paintRequested[QPrinter].connect(self.__print) - preview.exec_() + preview.exec() def __print(self, printer): """
--- a/eric6/Graphics/SvgDiagram.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Graphics/SvgDiagram.py Tue Oct 06 17:52:44 2020 +0200 @@ -289,7 +289,7 @@ printer.setPrinterName(printerName) printDialog = QPrintDialog(printer, self) - if printDialog.exec_(): + if printDialog.exec(): self.__print(printer) def __printPreviewDiagram(self): @@ -321,7 +321,7 @@ preview = QPrintPreviewDialog(printer, self) preview.paintRequested[QPrinter].connect(self.__print) - preview.exec_() + preview.exec() def __print(self, printer): """
--- a/eric6/Graphics/UMLGraphicsView.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Graphics/UMLGraphicsView.py Tue Oct 06 17:52:44 2020 +0200 @@ -309,7 +309,7 @@ sceneRect = self.scene().sceneRect() dlg = UMLSceneSizeDialog(sceneRect.width(), sceneRect.height(), rect.width(), rect.height(), self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: width, height = dlg.getData() self.setSceneSize(width, height) self.__checkSizeActions() @@ -423,7 +423,7 @@ printer.setPrinterName(printerName) printDialog = QPrintDialog(printer, self) - if printDialog.exec_(): + if printDialog.exec(): super(UMLGraphicsView, self).printDiagram( printer, self.diagramName) @@ -456,7 +456,7 @@ preview = QPrintPreviewDialog(printer, self) preview.paintRequested[QPrinter].connect(self.__printPreviewPrint) - preview.exec_() + preview.exec() def __printPreviewPrint(self, printer): """
--- a/eric6/HexEdit/HexEditMainWindow.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/HexEdit/HexEditMainWindow.py Tue Oct 06 17:52:44 2020 +0200 @@ -1369,7 +1369,7 @@ self.__preferencesChangedByLocalPreferencesDialog) dlg.show() dlg.showConfigurationPageByName("hexEditorPage") - dlg.exec_() + dlg.exec() QCoreApplication.processEvents() if dlg.result() == QDialog.Accepted: dlg.setPreferences()
--- a/eric6/IconEditor/IconEditorGrid.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/IconEditor/IconEditorGrid.py Tue Oct 06 17:52:44 2020 +0200 @@ -988,7 +988,7 @@ """ from .IconSizeDialog import IconSizeDialog dlg = IconSizeDialog(self.__image.width(), self.__image.height()) - res = dlg.exec_() + res = dlg.exec() if res == QDialog.Accepted: newWidth, newHeight = dlg.getData() if ( @@ -1011,7 +1011,7 @@ """ from .IconSizeDialog import IconSizeDialog dlg = IconSizeDialog(self.__image.width(), self.__image.height()) - res = dlg.exec_() + res = dlg.exec() if res == QDialog.Accepted: width, height = dlg.getData() img = QImage(width, height, QImage.Format_ARGB32)
--- a/eric6/MicroPython/CircuitPythonDevices.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MicroPython/CircuitPythonDevices.py Tue Oct 06 17:52:44 2020 +0200 @@ -202,7 +202,7 @@ from .CircuitPythonFirmwareSelectionDialog import ( CircuitPythonFirmwareSelectionDialog) dlg = CircuitPythonFirmwareSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cpyPath, devicePath = dlg.getData() shutil.copy2(cpyPath, devicePath)
--- a/eric6/MicroPython/EspDevices.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MicroPython/EspDevices.py Tue Oct 06 17:52:44 2020 +0200 @@ -179,7 +179,7 @@ showProgress=True) res = dlg.startProcess(sys.executable, flashArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __flashMicroPython(self): @@ -190,7 +190,7 @@ """ from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog dlg = EspFirmwareSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: chip, firmware, flashMode, _ = dlg.getData() if chip == "esp8266": flashAddress = "0x0000" @@ -219,7 +219,7 @@ showProgress=True) res = dlg.startProcess(sys.executable, flashArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __flashAddons(self): @@ -228,7 +228,7 @@ """ from .EspFirmwareSelectionDialog import EspFirmwareSelectionDialog dlg = EspFirmwareSelectionDialog(addon=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: chip, firmware, flashMode, flashAddress = dlg.getData() flashArgs = [ "-u", @@ -250,7 +250,7 @@ showProgress=True) res = dlg.startProcess(sys.executable, flashArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __backupFlash(self): @@ -261,7 +261,7 @@ EspBackupRestoreFirmwareDialog ) dlg = EspBackupRestoreFirmwareDialog(backupMode=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: chip, flashSize, flashMode, firmware = dlg.getData() flashArgs = [ "-u", @@ -277,7 +277,7 @@ showProgress=True) res = dlg.startProcess(sys.executable, flashArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __restoreFlash(self): @@ -288,7 +288,7 @@ EspBackupRestoreFirmwareDialog ) dlg = EspBackupRestoreFirmwareDialog(backupMode=False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: chip, flashSize, flashMode, firmware = dlg.getData() flashArgs = [ "-u", @@ -311,7 +311,7 @@ showProgress=True) res = dlg.startProcess(sys.executable, flashArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __showChipID(self): @@ -328,7 +328,7 @@ self.tr("Show Chip ID")) res = dlg.startProcess(sys.executable, args) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __showFlashID(self): @@ -345,7 +345,7 @@ self.tr("Show Flash ID")) res = dlg.startProcess(sys.executable, args) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __showMACAddress(self): @@ -362,7 +362,7 @@ self.tr("Show MAC Address")) res = dlg.startProcess(sys.executable, args) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __resetDevice(self):
--- a/eric6/MicroPython/MicroPythonFileManagerWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MicroPython/MicroPythonFileManagerWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -609,7 +609,7 @@ self.__localDelDirTreeAct.setEnabled(isDir) self.__localDelFileAct.setEnabled(isFile) - self.__localMenu.exec_(self.localFileTreeWidget.mapToGlobal(pos)) + self.__localMenu.exec(self.localFileTreeWidget.mapToGlobal(pos)) @pyqtSlot() def __changeLocalDirectory(self, localDevice=False): @@ -695,7 +695,7 @@ self.tr( "Do you really want to delete this directory tree?"), [dirname]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: try: shutil.rmtree(dirname) self.__listLocalFiles(cwdWidget.text(), @@ -733,7 +733,7 @@ self.tr( "Do you really want to delete this file?"), [filename]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: try: os.remove(filename) self.__listLocalFiles(cwdWidget.text(), @@ -784,7 +784,7 @@ self.__devDelDirTreeAct.setEnabled(isDir) self.__devDelFileAct.setEnabled(isFile) - self.__deviceMenu.exec_(self.deviceFileTreeWidget.mapToGlobal(pos)) + self.__deviceMenu.exec(self.deviceFileTreeWidget.mapToGlobal(pos)) @pyqtSlot() def __changeDeviceDirectory(self): @@ -848,7 +848,7 @@ self.tr( "Do you really want to delete this directory?"), [dirname]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__fileManager.rmdir(dirname) @pyqtSlot() @@ -876,7 +876,7 @@ self.tr( "Do you really want to delete this directory tree?"), [dirname]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__fileManager.rmdir(dirname, recursive=True) @pyqtSlot() @@ -903,7 +903,7 @@ self.tr( "Do you really want to delete this file?"), [filename]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__fileManager.delete(filename) @pyqtSlot(bool)
--- a/eric6/MicroPython/MicroPythonWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MicroPython/MicroPythonWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -465,7 +465,7 @@ menu.addAction(self.tr("Copy"), self.replEdit.copy, copyKeys) menu.addAction(self.tr("Paste"), self.__paste, pasteKeys) menu.addSeparator() - menu.exec_(self.replEdit.mapToGlobal(pos)) + menu.exec(self.replEdit.mapToGlobal(pos)) def __setConnected(self, connected): """ @@ -1487,7 +1487,7 @@ dlg = E5ProcessDialog(self.tr("'mpy-cross' Output"), title) res = dlg.startProcess(program, compileArgs) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __compileFile2Mpy(self): @@ -1553,7 +1553,7 @@ dlg = IgnoredDevicesDialog( Preferences.getMicroPython("IgnoredUnknownDevices"), self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: ignoredDevices = dlg.getDevices() Preferences.setMicroPython("IgnoredUnknownDevices", ignoredDevices)
--- a/eric6/MicroPython/PyBoardDevices.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MicroPython/PyBoardDevices.py Tue Oct 06 17:52:44 2020 +0200 @@ -325,7 +325,7 @@ ) res = dlg.startProcess(program, args) if res: - dlg.exec_() + dlg.exec() @pyqtSlot() def __flashMicroPython(self): @@ -359,5 +359,5 @@ ) res = dlg.startProcess(program, args) if res: - dlg.exec_() + dlg.exec() self.__showDfuDisableInstructions()
--- a/eric6/MultiProject/MultiProject.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MultiProject/MultiProject.py Tue Oct 06 17:52:44 2020 +0200 @@ -324,7 +324,7 @@ startdir = Preferences.getMultiProject("Workspace") dlg = AddProjectDialog(self.ui, startdir=startdir, categories=self.categories, category=category) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, filename, isMaster, description, category, uid = ( dlg.getData() ) @@ -503,7 +503,7 @@ from .PropertiesDialog import PropertiesDialog dlg = PropertiesDialog(self, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.closeMultiProject() dlg.storeData() self.opened = True @@ -520,7 +520,7 @@ """ from .PropertiesDialog import PropertiesDialog dlg = PropertiesDialog(self, False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.storeData() self.setDirty(True) self.multiProjectPropertiesChanged.emit()
--- a/eric6/MultiProject/MultiProjectBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/MultiProject/MultiProjectBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -367,7 +367,7 @@ dlg = AddProjectDialog( self, project=project, categories=self.multiProject.getCategories()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (name, filename, isMaster, description, category, uid) = dlg.getData() project = {
--- a/eric6/Network/IRC/IrcNetworkEditDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkEditDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -137,7 +137,7 @@ from .IrcIdentitiesEditDialog import IrcIdentitiesEditDialog currentIdentity = self.identityCombo.currentText() dlg = IrcIdentitiesEditDialog(self.__manager, currentIdentity, self) - dlg.exec_() + dlg.exec() self.__refreshIdentityCombo(currentIdentity) @pyqtSlot(str) @@ -156,7 +156,7 @@ """ from .IrcServerEditDialog import IrcServerEditDialog dlg = IrcServerEditDialog(self.__network.getServer()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__network.setServer(dlg.getServer()) self.serverEdit.setText(self.__network.getServerName()) @@ -238,7 +238,7 @@ from .IrcChannelEditDialog import IrcChannelEditDialog dlg = IrcChannelEditDialog(name, key, autoJoin, itm is not None, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: from .IrcNetworkManager import IrcChannel name, key, autoJoin = dlg.getData() channel = IrcChannel(name)
--- a/eric6/Network/IRC/IrcNetworkListDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Network/IRC/IrcNetworkListDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -130,7 +130,7 @@ """ from .IrcNetworkEditDialog import IrcNetworkEditDialog dlg = IrcNetworkEditDialog(self.__manager, "", self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: network = dlg.getNetwork() self.__manager.addNetwork(network) self.__refreshNetworksList() @@ -145,7 +145,7 @@ from .IrcNetworkEditDialog import IrcNetworkEditDialog networkName = itm.text(0) dlg = IrcNetworkEditDialog(self.__manager, networkName, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: network = dlg.getNetwork() self.__manager.setNetwork(network, networkName) if network.getName() != networkName: @@ -248,7 +248,7 @@ """ from .IrcIdentitiesEditDialog import IrcIdentitiesEditDialog dlg = IrcIdentitiesEditDialog(self.__manager, "", self) - dlg.exec_() + dlg.exec() selectedNetwork = self.networksList.selectedItems() if selectedNetwork:
--- a/eric6/Network/IRC/IrcWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Network/IRC/IrcWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -285,7 +285,7 @@ """ from .IrcNetworkListDialog import IrcNetworkListDialog dlg = IrcNetworkListDialog(self.__ircNetworkManager, self) - dlg.exec_() + dlg.exec() def __networkDataChanged(self): """
--- a/eric6/PipInterface/Pip.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/PipInterface/Pip.py Tue Oct 06 17:52:44 2020 +0200 @@ -254,7 +254,7 @@ res = dia.startProcesses(commands) if res: - dia.exec_() + dia.exec() @pyqtSlot() def repairPip(self, venvName): @@ -280,7 +280,7 @@ dia = PipDialog(self.tr('Repair PIP')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() def __checkUpgradePyQt(self, packages): """ @@ -345,7 +345,7 @@ dia = PipDialog(self.tr('Upgrade Packages')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() return res def installPackages(self, packages, venvName="", userSite=False, @@ -380,7 +380,7 @@ dia = PipDialog(self.tr('Install Packages')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() def installRequirements(self, venvName): """ @@ -391,7 +391,7 @@ """ from .PipFileSelectionDialog import PipFileSelectionDialog dlg = PipFileSelectionDialog(self, "requirements") - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: requirements, user = dlg.getData() if requirements and os.path.exists(requirements): interpreter = self.getVirtualenvInterpreter(venvName) @@ -409,7 +409,7 @@ dia = PipDialog(self.tr('Install Packages from Requirements')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() def uninstallPackages(self, packages, venvName): """ @@ -433,7 +433,7 @@ self.tr( "Do you really want to uninstall these packages?"), packages) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: interpreter = self.getVirtualenvInterpreter(venvName) if not interpreter: return False @@ -441,7 +441,7 @@ dia = PipDialog(self.tr('Uninstall Packages')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() return res def uninstallRequirements(self, venvName): @@ -455,7 +455,7 @@ from .PipFileSelectionDialog import PipFileSelectionDialog dlg = PipFileSelectionDialog(self, "requirements", install=False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: requirements, _user = dlg.getData() if requirements and os.path.exists(requirements): try: @@ -474,7 +474,7 @@ self.tr( "Do you really want to uninstall these packages?"), reqs) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: interpreter = self.getVirtualenvInterpreter(venvName) if not interpreter: return @@ -485,7 +485,7 @@ self.tr('Uninstall Packages from Requirements')) res = dia.startProcess(interpreter, args) if res: - dia.exec_() + dia.exec() def getIndexUrl(self): """ @@ -681,7 +681,7 @@ dia = PipDialog(self.tr("Cache Info")) res = dia.startProcess(interpreter, args, showArgs=False) if res: - dia.exec_() + dia.exec() def cacheList(self, venvName): """ @@ -707,7 +707,7 @@ res = dia.startProcess(interpreter, args, showArgs=False) if res: - dia.exec_() + dia.exec() def cacheRemove(self, venvName): """ @@ -731,7 +731,7 @@ res = dia.startProcess(interpreter, args, showArgs=False) if res: - dia.exec_() + dia.exec() def cachePurge(self, venvName): """ @@ -754,4 +754,4 @@ res = dia.startProcess(interpreter, args, showArgs=False) if res: - dia.exec_() + dia.exec()
--- a/eric6/PipInterface/PipPackagesWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/PipInterface/PipPackagesWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -1056,7 +1056,7 @@ if venvName: from .PipPackagesInputDialog import PipPackagesInputDialog dlg = PipPackagesInputDialog(self, self.tr("Install Packages")) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: packages, user = dlg.getData() if packages: self.__pip.installPackages(packages, venvName=venvName, @@ -1071,7 +1071,7 @@ if venvName: from .PipFileSelectionDialog import PipFileSelectionDialog dlg = PipFileSelectionDialog(self, "package") - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: package, user = dlg.getData() if package and os.path.exists(package): self.__pip.installPackages([package], venvName=venvName,
--- a/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -1154,7 +1154,7 @@ from .CodeStyleCodeSelectionDialog import CodeStyleCodeSelectionDialog dlg = CodeStyleCodeSelectionDialog(edit.text(), categories, showFixCodes, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: edit.setText(dlg.getSelectedCodes()) @pyqtSlot() @@ -1281,7 +1281,7 @@ """ from .CodeStyleStatisticsDialog import CodeStyleStatisticsDialog dlg = CodeStyleStatisticsDialog(self.__statistics, self) - dlg.exec_() + dlg.exec() @pyqtSlot() def on_loadDefaultButton_clicked(self): @@ -1776,7 +1776,7 @@ CodeStyleAddBuiltinIgnoreDialog ) dlg = CodeStyleAddBuiltinIgnoreDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: left, right = dlg.getData() QTreeWidgetItem(self.builtinsAssignmentList, [left, right])
--- a/eric6/Plugins/PluginEricapi.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginEricapi.py Tue Oct 06 17:52:44 2020 +0200 @@ -160,7 +160,7 @@ project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4API") dlg = EricapiConfigDialog(project, parms) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: args, parms = dlg.generateParameters() project.setData('DOCUMENTATIONPARMS', "ERIC4API", parms) @@ -176,7 +176,7 @@ dia = EricapiExecDialog("Ericapi") res = dia.start(args, project.ppath) if res: - dia.exec_() + dia.exec() outputFileName = Utilities.toNativeSeparators(parms['outputFile'])
--- a/eric6/Plugins/PluginEricdoc.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginEricdoc.py Tue Oct 06 17:52:44 2020 +0200 @@ -181,7 +181,7 @@ project = e5App().getObject("Project") parms = project.getData('DOCUMENTATIONPARMS', "ERIC4DOC") dlg = EricdocConfigDialog(project, parms) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: args, parms = dlg.generateParameters() project.setData('DOCUMENTATIONPARMS', "ERIC4DOC", parms) @@ -197,7 +197,7 @@ dia = EricdocExecDialog("Ericdoc") res = dia.start(args, project.ppath) if res: - dia.exec_() + dia.exec() outdir = Utilities.toNativeSeparators(parms['outputDirectory']) if outdir == '':
--- a/eric6/Plugins/PluginWizardDotDesktop.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardDotDesktop.py Tue Oct 06 17:52:44 2020 +0200 @@ -133,7 +133,7 @@ DotDesktopWizardDialog ) dlg = DotDesktopWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: code = dlg.getCode() if code: editor.selectAll()
--- a/eric6/Plugins/PluginWizardE5MessageBox.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardE5MessageBox.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ E5MessageBoxWizardDialog ) dlg = E5MessageBoxWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardEricPlugin.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardEricPlugin.py Tue Oct 06 17:52:44 2020 +0200 @@ -120,7 +120,7 @@ PluginWizardDialog ) dlg = PluginWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: return (dlg.getCode(), dlg.packageName(), True) else: return (None, "", False)
--- a/eric6/Plugins/PluginWizardPyRegExp.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardPyRegExp.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ PyRegExpWizardDialog ) dlg = PyRegExpWizardDialog(None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQColorDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQColorDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ ColorDialogWizardDialog ) dlg = ColorDialogWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQFileDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQFileDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -132,7 +132,7 @@ FileDialogWizardDialog ) dlg = FileDialogWizardDialog(variant, None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQFontDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQFontDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ FontDialogWizardDialog ) dlg = FontDialogWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQInputDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQInputDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ InputDialogWizardDialog ) dlg = InputDialogWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQMessageBox.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQMessageBox.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ MessageBoxWizardDialog ) dlg = MessageBoxWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQRegExp.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQRegExp.py Tue Oct 06 17:52:44 2020 +0200 @@ -104,7 +104,7 @@ QRegExpWizardDialog ) dlg = QRegExpWizardDialog(None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardQRegularExpression.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardQRegularExpression.py Tue Oct 06 17:52:44 2020 +0200 @@ -105,7 +105,7 @@ ) dlg = QRegularExpressionWizardDialog.QRegularExpressionWizardDialog( None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/PluginWizardSetup.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/PluginWizardSetup.py Tue Oct 06 17:52:44 2020 +0200 @@ -118,7 +118,7 @@ SetupWizardDialog ) dlg = SetupWizardDialog(None) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: line, index = editor.getCursorPosition() indLevel = editor.indentation(line) // editor.indentationWidth() if editor.indentationsUseTabs():
--- a/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/UiExtensionPlugins/Translator/TranslatorRequest.py Tue Oct 06 17:52:44 2020 +0200 @@ -58,7 +58,7 @@ request.setRawHeader(name, value) reply = self.__networkManager.get(request) if not self.__loop.isRunning(): - self.__loop.exec_() + self.__loop.exec() if reply.error() != QNetworkReply.NoError: return reply.errorString(), False else: @@ -91,7 +91,7 @@ request.setUrl(requestUrl) reply = self.__networkManager.post(request, requestData) if not self.__loop.isRunning(): - self.__loop.exec_() + self.__loop.exec() if reply.error() != QNetworkReply.NoError: return reply.errorString(), False else:
--- a/eric6/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ConfigurationPage/GitPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -89,7 +89,7 @@ if not os.path.exists(cfgFile): from ..GitUserConfigDataDialog import GitUserConfigDataDialog dlg = GitUserConfigDataDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: firstName, lastName, email = dlg.getData() else: firstName, lastName, email = (
--- a/eric6/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/GitPatchStatisticsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -63,7 +63,7 @@ from .GitPatchFilesDialog import GitPatchFilesDialog dlg = GitPatchFilesDialog(repodir, patchCheckData) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: patchFilesList, stripCount, inaccurateEof, recount = dlg.getData() self.__patchCheckData = (patchFilesList, stripCount, inaccurateEof, recount)
--- a/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/ProjectBrowserHelper.py Tue Oct 06 17:52:44 2020 +0200 @@ -592,7 +592,7 @@ " from the repository?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.vcs.vcsRemove(names, stageOnly=True) for fn in names:
--- a/eric6/Plugins/VcsPlugins/vcsGit/git.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsGit/git.py Tue Oct 06 17:52:44 2020 +0200 @@ -279,7 +279,7 @@ dia = GitDialog(self.tr('Creating Git repository'), self) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() status = dia.normalExit() if status: @@ -296,7 +296,7 @@ self) res = dia.startProcess(args, projectDir) if res: - dia.exec_() + dia.exec() status = dia.normalExit() if status: @@ -307,7 +307,7 @@ self) res = dia.startProcess(args, projectDir) if res: - dia.exec_() + dia.exec() status = dia.normalExit() return status, False @@ -337,7 +337,7 @@ self) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() return dia.normalExit() def vcsExport(self, vcsDataDict, projectDir): @@ -487,7 +487,7 @@ self) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() self.committed.emit() self.checkVCSStatus() @@ -541,7 +541,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -589,7 +589,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def vcsAddBinary(self, name, isDir=False): """ @@ -664,7 +664,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExitWithoutErrors() return res @@ -690,7 +690,7 @@ else: from .GitCopyDialog import GitCopyDialog dlg = GitCopyDialog(name, None, True) - accepted = dlg.exec_() == QDialog.Accepted + accepted = dlg.exec() == QDialog.Accepted if accepted: target, force = dlg.getData() @@ -717,7 +717,7 @@ dia = GitDialog(self.tr('Renaming {0}').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExit() if res: if target.startswith(project.getProjectPath()): @@ -842,7 +842,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -887,7 +887,7 @@ "Do you really want to revert all changes to these files" " or directories?"), names) - yes = dlg.exec_() == QDialog.Accepted + yes = dlg.exec() == QDialog.Accepted else: yes = E5MessageBox.yesNo( None, @@ -898,7 +898,7 @@ dia = GitDialog(self.tr('Reverting changes'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() else: @@ -926,7 +926,7 @@ self.gitGetBranchesList(repodir, withMaster=True), self.gitGetCurrentBranch(repodir), self.gitGetBranchesList(repodir, remotes=True)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: commit, doCommit, commitMessage, addLog, diffStat = ( dlg.getParameters() ) @@ -951,7 +951,7 @@ dia = GitDialog(self.tr('Merging').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def vcsSwitch(self, name): @@ -979,7 +979,7 @@ trackingBranchesList=self.gitGetBranchesList( repodir, remotes=True), noneLabel=self.tr("Master branch head")) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev = dlg.getRevision() return self.vcsUpdate(name, revision=rev) @@ -1184,7 +1184,7 @@ """ from .GitCommandDialog import GitCommandDialog dlg = GitCommandDialog(self.commandHistory, name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: command = dlg.getData() commandList = Utilities.parseOptionString(command) @@ -1207,7 +1207,7 @@ dia = GitDialog(self.tr('Git Command'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ @@ -1426,7 +1426,7 @@ """ from .GitCopyDialog import GitCopyDialog dlg = GitCopyDialog(name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: target, force = dlg.getData() # step 1: copy the file/directory: @@ -1515,7 +1515,7 @@ from .GitRevisionsSelectionDialog import GitRevisionsSelectionDialog dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revisions = dlg.getRevisions() if self.diff is None: from .GitDiffDialog import GitDiffDialog @@ -1599,7 +1599,7 @@ ) dlg = GitRevisionsSelectionDialog(self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() elif revisions: rev1, rev2 = revisions[0], revisions[1] @@ -1663,7 +1663,7 @@ from .GitFetchDialog import GitFetchDialog dlg = GitFetchDialog(self, repodir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (remote, url, remoteBranches, localBranch, fetchAll, prune, includeTags) = dlg.getData() @@ -1686,7 +1686,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def gitPull(self, name): @@ -1706,7 +1706,7 @@ from .GitPullDialog import GitPullDialog dlg = GitPullDialog(self, repodir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: remote, url, branches, pullAll, prune = dlg.getData() args = self.initCommand('pull') @@ -1724,7 +1724,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -1746,7 +1746,7 @@ from .GitPushDialog import GitPushDialog dlg = GitPushDialog(self, repodir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: remote, refspecs, tags, tracking, submodule = dlg.getData() args = self.initCommand("push") @@ -1765,7 +1765,7 @@ self.tr('Pushing to a remote Git repository'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def gitCommitMerge(self, name): @@ -1792,7 +1792,7 @@ dia = GitDialog(self.tr('Committing failed merge'), self) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() self.committed.emit() self.checkVCSStatus() @@ -1821,7 +1821,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -1854,7 +1854,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitApplyCheckPatches(self, projectDir, check=False): """ @@ -1873,7 +1873,7 @@ from .GitPatchFilesDialog import GitPatchFilesDialog dlg = GitPatchFilesDialog(repodir, self.__patchCheckData) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: patchFilesList, stripCount, inaccurateEof, recount = dlg.getData() if patchFilesList: args = self.initCommand("apply") @@ -1897,7 +1897,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() if not check: self.checkVCSStatus() @@ -1940,7 +1940,7 @@ from .GitTagDialog import GitTagDialog dlg = GitTagDialog(self.gitGetTagsList(repodir), revision, tagName) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, revision, tagOp, tagType, force = dlg.getParameters() else: return False @@ -1970,7 +1970,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() return True @@ -2136,7 +2136,7 @@ dlg = GitBranchDialog( self.gitGetBranchesList(repodir, allBranches=True), revision, branchName, branchOp) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: branchOp, branch, revision, newBranch, remoteBranch, force = ( dlg.getParameters() ) @@ -2197,7 +2197,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() if branchOp in [GitBranchDialog.CreateSwitchBranch, GitBranchDialog.CreateTrackingBranch]: update = dia.hasAddOrDelete() @@ -2226,7 +2226,7 @@ dlg = GitBranchPushDialog(self.gitGetBranchesList(repodir), self.gitGetRemotesList(repodir), delete=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: branchName, remoteName = dlg.getData()[:2] args = self.initCommand("push") @@ -2236,7 +2236,7 @@ dia = GitDialog(self.tr('Delete Remote Branch'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitShowBranch(self, name): """ @@ -2280,7 +2280,7 @@ from .GitBundleDialog import GitBundleDialog dlg = GitBundleDialog(self.gitGetTagsList(repodir), self.gitGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revs = dlg.getData() fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter( @@ -2321,7 +2321,7 @@ dia = GitDialog(self.tr('Create Bundle'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitVerifyBundle(self, projectDir): """ @@ -2351,7 +2351,7 @@ dia = GitDialog(self.tr('Verify Bundle'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitBundleListHeads(self, projectDir): """ @@ -2381,7 +2381,7 @@ dia = GitDialog(self.tr('List Bundle Heads'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitGetBundleHeads(self, repodir, bundleFile): """ @@ -2441,7 +2441,7 @@ dlg = GitApplyBundleDataDialog( self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: bundleHead, branch = dlg.getData() args = self.initCommand("fetch") @@ -2456,7 +2456,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -2489,7 +2489,7 @@ dlg = GitApplyBundleDataDialog( self.gitGetBundleHeads(repodir, fname), self.gitGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: bundleHead, branch = dlg.getData() args = self.initCommand("pull") @@ -2504,7 +2504,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -2548,7 +2548,7 @@ self.gitGetBranchesList(repodir), showBranches=showBranches, showHead=showHead) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev = dlg.getRevision() else: return False @@ -2557,7 +2557,7 @@ if subcommand == "start_extended": from .GitBisectStartDialog import GitBisectStartDialog dlg = GitBisectStartDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: bad, good, noCheckout = dlg.getData() args.append("start") if noCheckout: @@ -2577,7 +2577,7 @@ self.tr('Git Bisect ({0})').format(subcommand), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -2732,7 +2732,7 @@ self.tr('Git Bisect ({0})').format("replay"), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -2890,7 +2890,7 @@ dia = GitDialog(self.tr('Show Remote Info'), self) res = dia.startProcess(args, repodir, showArgs=False) if res: - dia.exec_() + dia.exec() def gitShowRemotes(self, projectDir): """ @@ -2922,7 +2922,7 @@ from .GitAddRemoteDialog import GitAddRemoteDialog dlg = GitAddRemoteDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, url = dlg.getData() args = self.initCommand("remote") args.append("add") @@ -2983,7 +2983,7 @@ from .GitChangeRemoteUrlDialog import GitChangeRemoteUrlDialog dlg = GitChangeRemoteUrlDialog(remoteName, remoteUrl) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, url = dlg.getData() if url != remoteUrl: args = self.initCommand("remote") @@ -3017,7 +3017,7 @@ from .GitRemoteCredentialsDialog import GitRemoteCredentialsDialog dlg = GitRemoteCredentialsDialog(remoteName, remoteUrl) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, url = dlg.getData() if url != remoteUrl: args = self.initCommand("remote") @@ -3070,7 +3070,7 @@ dia = GitDialog(self.tr('Show Remote Info'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitShortlog(self, projectDir, commit): """ @@ -3094,7 +3094,7 @@ dia = GitDialog(self.tr('Show Shortlog'), self) res = dia.startProcess(args, repodir, showArgs=False) if res: - dia.exec_() + dia.exec() def gitDescribe(self, projectDir, commits): """ @@ -3135,7 +3135,7 @@ from .GitCherryPickDialog import GitCherryPickDialog dlg = GitCherryPickDialog(commits) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: commits, cherrypickInfo, signoff, nocommit = ( dlg.getData() ) @@ -3153,7 +3153,7 @@ dia = GitDialog(self.tr('Cherry-pick'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3183,7 +3183,7 @@ dia = GitDialog(self.tr('Copy Changesets (Continue)'), self) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3208,7 +3208,7 @@ dia = GitDialog(self.tr('Copy Changesets (Quit)'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3234,7 +3234,7 @@ dia = GitDialog(self.tr('Copy Changesets (Cancel)'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3297,7 +3297,7 @@ res = False from .GitStashDataDialog import GitStashDataDialog dlg = GitStashDataDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: message, keepIndex, untracked = dlg.getData() args = self.initCommand("stash") args.append("save") @@ -3313,7 +3313,7 @@ dia = GitDialog(self.tr('Saving stash'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3398,7 +3398,7 @@ dia = GitDialog(self.tr('Restoring stash'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3438,7 +3438,7 @@ dia = GitDialog(self.tr('Restoring stash'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3487,7 +3487,7 @@ dia = GitDialog(self.tr('Creating branch'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -3532,7 +3532,7 @@ dia = GitDialog(self.tr('Deleting stash'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() return res def gitStashClear(self, projectDir): @@ -3560,7 +3560,7 @@ dia = GitDialog(self.tr('Deleting all stashes'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() return res def gitEditConfig(self, projectDir): @@ -3596,7 +3596,7 @@ if not os.path.exists(cfgFile): from .GitUserConfigDataDialog import GitUserConfigDataDialog dlg = GitUserConfigDataDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: firstName, lastName, email = dlg.getData() else: firstName, lastName, email = ( @@ -3634,7 +3634,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def gitVerify(self, projectDir): """ @@ -3660,7 +3660,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def gitHouseKeeping(self, projectDir): """ @@ -3685,7 +3685,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitStatistics(self, projectDir): """ @@ -3760,7 +3760,7 @@ else: info.append(self.tr("<p><b>No statistics available.</b></p>")) dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) - dlg.exec_() + dlg.exec() def gitGetArchiveFormats(self, repodir): """ @@ -3811,7 +3811,7 @@ self.gitGetBranchesList(repodir, withMaster=True), self.gitGetArchiveFormats(repodir) ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: commit, archiveFormat, fileName, prefix = dlg.getData() args = self.initCommand("archive") args.append("--format={0}".format(archiveFormat)) @@ -3828,7 +3828,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() ########################################################################### ## Methods related to submodules. @@ -3850,7 +3850,7 @@ from .GitSubmoduleAddDialog import GitSubmoduleAddDialog dlg = GitSubmoduleAddDialog(self, repodir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: repo, branch, name, path, force = dlg.getData() args = self.initCommand("submodule") args.append("add") @@ -3871,7 +3871,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def __gitSubmodulesList(self, repodir): """ @@ -3932,7 +3932,7 @@ if submodulesList: from .GitSubmodulesListDialog import GitSubmodulesListDialog dlg = GitSubmodulesListDialog(submodulesList) - dlg.exec_() + dlg.exec() else: E5MessageBox.information( None, @@ -3978,7 +3978,7 @@ from .GitListDialog import GitListDialog dlg = GitListDialog(sorted(paths)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: selectedPaths = dlg.getSelection() return selectedPaths, True else: @@ -4009,7 +4009,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitSubmoduleDeinit(self, projectDir): """ @@ -4030,7 +4030,7 @@ from .GitSubmodulesDeinitDialog import GitSubmodulesDeinitDialog dlg = GitSubmodulesDeinitDialog(paths) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: deinitAll, submodulePaths, force = dlg.getData() args = self.initCommand("submodule") args.append("deinit") @@ -4046,7 +4046,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitSubmoduleUpdate(self, projectDir, initialize=False, remote=False): """ @@ -4081,7 +4081,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitSubmoduleUpdateWithOptions(self, projectDir): """ @@ -4105,7 +4105,7 @@ GitSubmodulesUpdateOptionsDialog ) dlg = GitSubmodulesUpdateOptionsDialog(paths) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: procedure, init, remote, noFetch, force, submodulePaths = ( dlg.getData() ) @@ -4128,7 +4128,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitSubmoduleSync(self, projectDir): """ @@ -4149,7 +4149,7 @@ from .GitSubmodulesSyncDialog import GitSubmodulesSyncDialog dlg = GitSubmodulesSyncDialog(paths) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: submodulePaths, recursive = dlg.getData() args = self.initCommand("submodule") args.append("sync") @@ -4162,7 +4162,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def gitSubmoduleStatus(self, projectDir): """ @@ -4199,7 +4199,7 @@ GitSubmodulesSummaryOptionsDialog ) dlg = GitSubmodulesSummaryOptionsDialog(paths) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: submodulePaths, superProject, index, commit, limit = dlg.getData() args = self.initCommand("submodule") args.append("summary") @@ -4221,7 +4221,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() ########################################################################### ## Methods to get the helper objects are below.
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/CloseheadExtension/closehead.py Tue Oct 06 17:52:44 2020 +0200 @@ -49,7 +49,7 @@ if not revisions: from .HgCloseHeadSelectionDialog import HgCloseHeadSelectionDialog dlg = HgCloseHeadSelectionDialog(self.vcs, name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revisions, message = dlg.getData() if not revisions: @@ -71,4 +71,4 @@ dia = HgDialog(self.tr("Closing Heads"), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -121,4 +121,4 @@ from ..HgUtilities import hgVersion dlg = HgUserConfigDialog(version=hgVersion(self.__plugin)[1]) - dlg.exec_() + dlg.exec()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/GpgExtension/gpg.py Tue Oct 06 17:52:44 2020 +0200 @@ -68,7 +68,7 @@ self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev = dlg.getRevision(revset=False) if rev is not None: @@ -80,7 +80,7 @@ dia = HgDialog(self.tr('Verify Signatures'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgGpgSign(self, path, revisions=None): """ @@ -103,7 +103,7 @@ dlg = HgGpgSignDialog(self.vcs.hgGetTagsList(repodir), self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revision, noCommit, message, keyId, local, force = ( dlg.getData() ) @@ -139,4 +139,4 @@ dia = HgDialog(self.tr('Sign Revision'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgClient.py Tue Oct 06 17:52:44 2020 +0200 @@ -312,7 +312,7 @@ inputData = "" isPassword = False dlg = HgClientPromptDialog(size, message) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: inputData = dlg.getInput() + '\n' isPassword = dlg.isPassword() return inputData, isPassword
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -207,7 +207,7 @@ loop = QEventLoop(self) self.sendButton.clicked[bool].connect(loop.quit) self.input.returnPressed.connect(loop.quit) - loop.exec_() + loop.exec() message = self.input.text() + "\n" isPassword = self.passwordCheckBox.isChecked()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -382,7 +382,7 @@ self.tr( "Do you really want to close all listed branches?"), branches) - yes = dlg.exec_() == QDialog.Accepted + yes = dlg.exec() == QDialog.Accepted if yes: self.vcs.getExtensionObject("closehead").hgCloseheads( self.__repoDir, branches)
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HgUserConfigDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -524,7 +524,7 @@ Private slot to add a fingerprints entry. """ dlg = HgUserConfigHostFingerprintDialog(self, version=self.__version) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: host, fingerprint = dlg.getData() itm = QTreeWidgetItem(self.fingerprintsList, [host, fingerprint]) self.__finalizeFingerprintsColumns() @@ -561,7 +561,7 @@ fingerprint = itm.text(1) dlg = HgUserConfigHostFingerprintDialog(self, host, fingerprint, version=self.__version) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: host, fingerprint = dlg.getData() itm.setText(0, host) itm.setText(1, fingerprint) @@ -632,7 +632,7 @@ """ dlg = HgUserConfigHostMinimumProtocolDialog(self.__minimumProtocols, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: host, protocol = dlg.getData() itm = QTreeWidgetItem(self.protocolsList, [ host, @@ -673,7 +673,7 @@ protocol = itm.data(1, Qt.UserRole) dlg = HgUserConfigHostMinimumProtocolDialog( self.__minimumProtocols, self, host, protocol) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: host, protocol = dlg.getData() itm.setText(0, host) itm.setText(1, self.__minimumProtocols[protocol])
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/HisteditExtension/histedit.py Tue Oct 06 17:52:44 2020 +0200 @@ -54,7 +54,7 @@ self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir), rev) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev, force, keep = dlg.getData() args = self.vcs.initCommand("histedit") @@ -79,7 +79,7 @@ useClient=False) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -114,7 +114,7 @@ useClient=False) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -149,7 +149,7 @@ useClient=False) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -185,7 +185,7 @@ useClient=False) res = dia.startProcess(args, repodir, environment=env) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/LargefilesExtension/largefiles.py Tue Oct 06 17:52:44 2020 +0200 @@ -55,7 +55,7 @@ from .LfConvertDataDialog import LfConvertDataDialog dlg = LfConvertDataDialog(projectDir, direction) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: newName, minSize, patterns = dlg.getData() newProjectFile = os.path.join( newName, os.path.basename(projectFile)) @@ -75,7 +75,7 @@ dia = HgDialog(self.tr('Convert Project - Converting'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExit() and os.path.isdir( os.path.join(newName, self.vcs.adminDir)) @@ -87,7 +87,7 @@ self.vcs, useClient=False) res = dia.startProcess(args, newName) if res: - dia.exec_() + dia.exec() res = dia.normalExit() and os.path.isfile(newProjectFile) # step 3: close current project and open new one @@ -137,7 +137,7 @@ self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgLfPull(self, projectDir, revisions=None): """ @@ -159,7 +159,7 @@ else: from .LfRevisionsInputDialog import LfRevisionsInputDialog dlg = LfRevisionsInputDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revs = dlg.getRevisions() if revs: @@ -172,7 +172,7 @@ dia = HgDialog(self.tr("Pulling large files"), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgLfVerify(self, projectDir, mode): """ @@ -203,4 +203,4 @@ self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py Tue Oct 06 17:52:44 2020 +0200 @@ -840,7 +840,7 @@ " from the repository?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.vcs.hgForget(names) for fn in names:
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/PurgeExtension/purge.py Tue Oct 06 17:52:44 2020 +0200 @@ -88,7 +88,7 @@ DeleteFilesConfirmationDialog ) dlg = DeleteFilesConfirmationDialog(None, title, message, entries) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: args = self.vcs.initCommand("purge") if deleteAll: args.append("--all") @@ -97,7 +97,7 @@ dia = HgDialog(title, self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgPurgeList(self, name, deleteAll=False): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/QueuesExtension/queues.py Tue Oct 06 17:52:44 2020 +0200 @@ -184,7 +184,7 @@ from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.NEW_MODE) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (name, message, (userData, currentUser, userName), (dateData, currentDate, dateStr)) = dlg.getData() @@ -210,7 +210,7 @@ dia = HgDialog(self.tr('New Patch'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.vcs.checkVCSStatus() def hgQueueRefreshPatch(self, name, editMessage=False): @@ -235,7 +235,7 @@ from .HgQueuesNewPatchDialog import HgQueuesNewPatchDialog dlg = HgQueuesNewPatchDialog(HgQueuesNewPatchDialog.REFRESH_MODE, currentMessage) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (name, message, (userData, currentUser, userName), (dateData, currentDate, dateStr)) = dlg.getData() @@ -260,7 +260,7 @@ dia = HgDialog(self.tr('Update Current Patch'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.vcs.checkVCSStatus() def hgQueueShowPatch(self, name): @@ -352,7 +352,7 @@ dia = HgDialog(title, self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -387,7 +387,7 @@ dia = HgDialog(self.tr('Finish Applied Patches'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.vcs.checkVCSStatus() def hgQueueRenamePatch(self, name): @@ -412,7 +412,7 @@ HgQueuesRenamePatchDialog ) dlg = HgQueuesRenamePatchDialog(currentPatch, patchnames) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: newName, selectedPatch = dlg.getData() if selectedPatch: args.append(selectedPatch) @@ -421,7 +421,7 @@ dia = HgDialog(self.tr("Rename Patch"), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgQueueDeletePatch(self, name): """ @@ -452,7 +452,7 @@ dia = HgDialog(self.tr("Delete Patch"), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() else: E5MessageBox.information( None, @@ -479,7 +479,7 @@ if patchnames: from .HgQueuesFoldDialog import HgQueuesFoldDialog dlg = HgQueuesFoldDialog(patchnames) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: message, patchesList = dlg.getData() if message: args.append("--message") @@ -490,7 +490,7 @@ dia = HgDialog(self.tr("Fold Patches"), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() else: E5MessageBox.information( None, @@ -625,7 +625,7 @@ ) dlg = HgQueuesGuardsSelectionDialog( guardsList, activeGuards=activeGuardsList, listOnly=False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: guards = dlg.getData() if guards: args = self.vcs.initCommand("qselect") @@ -634,7 +634,7 @@ dia = HgDialog(self.tr('Set Active Guards'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() else: E5MessageBox.information( None, @@ -661,7 +661,7 @@ dia = HgDialog(self.tr('Deactivate Guards'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgQueueGuardsIdentifyActive(self, name): """ @@ -682,7 +682,7 @@ HgQueuesGuardsSelectionDialog ) dlg = HgQueuesGuardsSelectionDialog(guardsList, listOnly=True) - dlg.exec_() + dlg.exec() def hgQueueCreateRenameQueue(self, name, isCreate): """ @@ -708,7 +708,7 @@ dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.NAME_INPUT, title, False, repodir, self.vcs) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: queueName = dlg.getData() if queueName: args = self.vcs.initCommand("qqueue") @@ -771,7 +771,7 @@ dlg = HgQueuesQueueManagementDialog( HgQueuesQueueManagementDialog.QUEUE_INPUT, title, True, repodir, self.vcs) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: queueName = dlg.getData() if queueName: args = self.vcs.initCommand("qqueue") @@ -846,7 +846,7 @@ self.tr('Initializing new queue repository'), self.vcs) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() def hgQueueStatus(self, name): """
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/RebaseExtension/rebase.py Tue Oct 06 17:52:44 2020 +0200 @@ -48,7 +48,7 @@ self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir), self.vcs.version) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (indicator, sourceRev, destRev, collapse, keep, keepBranches, detach, dryRunOnly, dryRunConfirm) = dlg.getData() @@ -79,7 +79,7 @@ dia = HgDialog(self.tr('Rebase Changesets'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -105,7 +105,7 @@ dia = HgDialog(self.tr('Rebase Changesets (Continue)'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -131,7 +131,7 @@ dia = HgDialog(self.tr('Rebase Changesets (Abort)'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/ShelveExtension/shelve.py Tue Oct 06 17:52:44 2020 +0200 @@ -83,7 +83,7 @@ res = False from .HgShelveDataDialog import HgShelveDataDialog dlg = HgShelveDataDialog(self.vcs.version) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: shelveName, dateTime, message, addRemove, keep = dlg.getData() args = self.vcs.initCommand("shelve") @@ -110,7 +110,7 @@ dia = HgDialog(self.tr('Shelve current changes'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -147,7 +147,7 @@ from .HgUnshelveDataDialog import HgUnshelveDataDialog dlg = HgUnshelveDataDialog(self.__hgGetShelveNamesList(repodir), shelveName=shelveName) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: shelveName, keep = dlg.getData() self.__unshelveKeep = keep # store for potential continue @@ -160,7 +160,7 @@ dia = HgDialog(self.tr('Restore shelved changes'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -185,7 +185,7 @@ dia = HgDialog(self.tr('Abort restore operation'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -212,7 +212,7 @@ dia = HgDialog(self.tr('Continue restore operation'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res @@ -236,7 +236,7 @@ dlg = HgShelvesSelectionDialog( self.tr("Select the shelves to be deleted:"), self.__hgGetShelveNamesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: shelveNames = dlg.getSelectedShelves() else: return @@ -249,7 +249,7 @@ self.tr("Delete shelves"), self.tr("Do you really want to delete these shelves?"), shelveNames) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: args = self.vcs.initCommand("shelve") args.append("--delete") args.extend(shelveNames) @@ -257,7 +257,7 @@ dia = HgDialog(self.tr('Delete shelves'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgCleanupShelves(self, name): """ @@ -283,4 +283,4 @@ dia = HgDialog(self.tr('Delete all shelves'), self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec()
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/StripExtension/strip.py Tue Oct 06 17:52:44 2020 +0200 @@ -53,7 +53,7 @@ self.vcs.hgGetBranchesList(repodir), self.vcs.hgGetBookmarksList(repodir), rev) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev, bookmark, force, noBackup, keep = dlg.getData() args = self.vcs.initCommand("strip") @@ -74,7 +74,7 @@ self.vcs) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.vcs.checkVCSStatus() return res
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Tue Oct 06 17:52:44 2020 +0200 @@ -312,7 +312,7 @@ dia = HgDialog(self.tr('Creating Mercurial repository'), self) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() status = dia.normalExit() if status: @@ -330,7 +330,7 @@ self) res = dia.startProcess(args, projectDir) if res: - dia.exec_() + dia.exec() status = dia.normalExit() return status, False @@ -370,7 +370,7 @@ self) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() return dia.normalExit() def vcsExport(self, vcsDataDict, projectDir): @@ -543,7 +543,7 @@ self) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() self.committed.emit() if self.__forgotNames: model = e5App().getObject("Project").getModel() @@ -614,7 +614,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -662,7 +662,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def vcsAddBinary(self, name, isDir=False): """ @@ -728,7 +728,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExitWithoutErrors() return res @@ -754,7 +754,7 @@ else: from .HgCopyDialog import HgCopyDialog dlg = HgCopyDialog(name, None, True) - accepted = dlg.exec_() == QDialog.Accepted + accepted = dlg.exec() == QDialog.Accepted if accepted: target, force = dlg.getData() @@ -781,7 +781,7 @@ dia = HgDialog(self.tr('Renaming {0}').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExit() if res: if target.startswith(project.getProjectPath()): @@ -883,7 +883,7 @@ from .HgTagDialog import HgTagDialog dlg = HgTagDialog(self.hgGetTagsList(repodir, withType=True), revision, tagName) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, revision, tagOp, force = dlg.getParameters() else: return False @@ -915,7 +915,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() return True @@ -960,7 +960,7 @@ "Do you really want to revert all changes to these files" " or directories?"), names) - yes = dlg.exec_() == QDialog.Accepted + yes = dlg.exec() == QDialog.Accepted else: yes = E5MessageBox.yesNo( None, @@ -971,7 +971,7 @@ dia = HgDialog(self.tr('Reverting changes'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() else: @@ -1002,7 +1002,7 @@ dlg = HgMergeDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev, force = dlg.getParameters() else: return @@ -1022,7 +1022,7 @@ dia = HgDialog(self.tr('Merging').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def hgReMerge(self, name): @@ -1064,7 +1064,7 @@ "Do you really want to re-merge these files" " or directories?"), names) - yes = dlg.exec_() == QDialog.Accepted + yes = dlg.exec() == QDialog.Accepted else: yes = E5MessageBox.yesNo( None, @@ -1074,7 +1074,7 @@ dia = HgDialog(self.tr('Re-Merging').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def vcsSwitch(self, name): @@ -1100,7 +1100,7 @@ self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir), self.tr("Current branch tip")) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev = dlg.getRevision() return self.vcsUpdate(name, revision=rev) @@ -1276,7 +1276,7 @@ """ from .HgCommandDialog import HgCommandDialog dlg = HgCommandDialog(self.commandHistory, name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: command = dlg.getData() commandList = Utilities.parseOptionString(command) @@ -1299,7 +1299,7 @@ dia = HgDialog(self.tr('Mercurial command'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ @@ -1441,7 +1441,7 @@ from .HgCopyDialog import HgCopyDialog dlg = HgCopyDialog(name) res = False - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: target, force = dlg.getData() args = self.initCommand("copy") @@ -1461,7 +1461,7 @@ self.tr('Copying {0}').format(name), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExit() if ( res and @@ -1625,7 +1625,7 @@ dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revisions = dlg.getRevisions() if self.diff is None: from .HgDiffDialog import HgDiffDialog @@ -1679,7 +1679,7 @@ dlg = HgRevisionsSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() else: return @@ -1819,7 +1819,7 @@ dia = HgDialog(title, self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() if ( self.bundleFile and @@ -1860,7 +1860,7 @@ self.tr('Pushing to a remote Mercurial repository'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def hgInfo(self, ppath, mode="heads"): @@ -1938,7 +1938,7 @@ .format(author, cdate, ctime)) dlg = VcsRepositoryInfoDialog(None, "\n".join(info)) - dlg.exec_() + dlg.exec() def hgConflicts(self, name): """ @@ -1988,7 +1988,7 @@ dia = HgDialog(title, self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def hgAbortMerge(self, name): @@ -2020,7 +2020,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -2042,7 +2042,7 @@ from .HgBranchInputDialog import HgBranchInputDialog dlg = HgBranchInputDialog(self.hgGetBranchesList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, commit = dlg.getData() name = name.strip().replace(" ", "_") args = self.initCommand("branch") @@ -2053,7 +2053,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() if commit: self.vcsCommit( repodir, @@ -2080,7 +2080,7 @@ dia = HgDialog(self.tr('Showing current branch'), self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def hgGetCurrentBranch(self, repodir): """ @@ -2103,7 +2103,7 @@ """ from .HgUserConfigDialog import HgUserConfigDialog dlg = HgUserConfigDialog(version=self.version) - dlg.exec_() + dlg.exec() def hgEditConfig(self, name, withLargefiles=True, largefilesData=None): """ @@ -2132,7 +2132,7 @@ from .HgRepoConfigDataDialog import HgRepoConfigDataDialog dlg = HgRepoConfigDataDialog(withLargefiles=withLargefiles, largefilesData=largefilesData) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: createContents = True defaultUrl, defaultPushUrl = dlg.getData() if withLargefiles: @@ -2190,7 +2190,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgShowConfig(self, name): """ @@ -2215,7 +2215,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def hgShowPaths(self, name): """ @@ -2239,7 +2239,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def hgRecover(self, name): """ @@ -2263,7 +2263,7 @@ self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def hgIdentify(self, name): """ @@ -2285,7 +2285,7 @@ dia = HgDialog(self.tr('Identifying project directory'), self) res = dia.startProcess(args, repodir, False) if res: - dia.exec_() + dia.exec() def hgCreateIgnoreFile(self, name, autoAdd=False): """ @@ -2364,7 +2364,7 @@ self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir), version=self.version) - if dlg.exec_() != QDialog.Accepted: + if dlg.exec() != QDialog.Accepted: return revs, baseRevs, compression, bundleAll = dlg.getParameters() @@ -2423,7 +2423,7 @@ dia = HgDialog(self.tr('Create changegroup'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgPreviewBundle(self, name): """ @@ -2504,7 +2504,7 @@ dia = HgDialog(self.tr('Apply changegroups'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() @@ -2539,7 +2539,7 @@ dlg = HgRevisionSelectionDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev = dlg.getRevision() else: return @@ -2553,7 +2553,7 @@ self.tr('Mercurial Bisect ({0})').format(subcommand), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgForget(self, name): """ @@ -2586,7 +2586,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() if isinstance(name, list): self.__forgotNames.extend(name) else: @@ -2612,7 +2612,7 @@ dlg = HgBackoutDialog(self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev, merge, date, user, message = dlg.getParameters() if not rev: E5MessageBox.warning( @@ -2638,7 +2638,7 @@ dia = HgDialog(self.tr('Backing out changeset'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgRollback(self, name): """ @@ -2665,7 +2665,7 @@ dia = HgDialog(self.tr('Rollback last transaction'), self) res = dia.startProcess(["rollback"], repodir) if res: - dia.exec_() + dia.exec() def hgServe(self, name): """ @@ -2705,7 +2705,7 @@ from .HgImportDialog import HgImportDialog dlg = HgImportDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (patchFile, noCommit, message, date, user, withSecret, stripCount, force) = dlg.getParameters() @@ -2735,7 +2735,7 @@ dia = HgDialog(self.tr("Import Patch"), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() else: @@ -2761,7 +2761,7 @@ from .HgExportDialog import HgExportDialog dlg = HgExportDialog(self.hgGetBookmarksList(repodir), self.version >= (4, 7, 0)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (filePattern, revisions, bookmark, switchParent, allText, noDates, git) = dlg.getParameters() @@ -2787,7 +2787,7 @@ dia = HgDialog(self.tr("Export Patches"), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgPhase(self, name, data=None): """ @@ -2811,7 +2811,7 @@ if data is None: from .HgPhaseDialog import HgPhaseDialog dlg = HgPhaseDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: data = dlg.getData() if data: @@ -2834,7 +2834,7 @@ dia = HgDialog(self.tr("Change Phase"), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.normalExitWithoutErrors() else: res = False @@ -2860,7 +2860,7 @@ from .HgGraftDialog import HgGraftDialog res = False dlg = HgGraftDialog(self, revs) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (revs, (userData, currentUser, userName), (dateData, currentDate, dateStr), @@ -2891,7 +2891,7 @@ dia = HgDialog(self.tr('Copy Changesets'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -2923,7 +2923,7 @@ dia = HgDialog(title, self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -2978,7 +2978,7 @@ from .HgArchiveDialog import HgArchiveDialog dlg = HgArchiveDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: archive, type_, prefix, subrepos = dlg.getData() args = self.initCommand("archive") @@ -2995,7 +2995,7 @@ dia = HgDialog(self.tr("Create Unversioned Archive"), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgDeleteBackups(self): """ @@ -3049,7 +3049,7 @@ ppath = self.__projectHelper.getProject().getProjectPath() hgsub = self.getHgSubPath() dlg = HgAddSubrepositoryDialog(ppath) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: relPath, subrepoType, subrepoUrl = dlg.getData() if subrepoType == "hg": url = subrepoUrl @@ -3140,7 +3140,7 @@ HgRemoveSubrepositoriesDialog ) dlg = HgRemoveSubrepositoriesDialog(subrepositories) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: subrepositories, removedSubrepos, deleteSubrepos = dlg.getData() contents = "\n".join(subrepositories) + "\n" try: @@ -3494,7 +3494,7 @@ self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revision, bookmark = dlg.getData() ok = True else: @@ -3510,7 +3510,7 @@ dia = HgDialog(self.tr('Mercurial Bookmark'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgBookmarkDelete(self, name, bookmark=None): """ @@ -3543,7 +3543,7 @@ dia = HgDialog(self.tr('Delete Mercurial Bookmark'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgBookmarkRename(self, name, renameInfo=None): """ @@ -3564,7 +3564,7 @@ if not renameInfo: from .HgBookmarkRenameDialog import HgBookmarkRenameDialog dlg = HgBookmarkRenameDialog(self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: renameInfo = dlg.getData() if renameInfo: @@ -3576,7 +3576,7 @@ dia = HgDialog(self.tr('Rename Mercurial Bookmark'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgBookmarkMove(self, name, revision=None, bookmark=None): """ @@ -3601,7 +3601,7 @@ self.hgGetTagsList(repodir), self.hgGetBranchesList(repodir), self.hgGetBookmarksList(repodir)) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revision, bookmark = dlg.getData() ok = True else: @@ -3618,7 +3618,7 @@ dia = HgDialog(self.tr('Move Mercurial Bookmark'), self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgBookmarkIncoming(self, name): """ @@ -3714,7 +3714,7 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec() def hgBookmarkPush(self, name, current=False, bookmark=None): """ @@ -3758,4 +3758,4 @@ self) res = dia.startProcess(args, repodir) if res: - dia.exec_() + dia.exec()
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnDialogMixin.py Tue Oct 06 17:52:44 2020 +0200 @@ -68,7 +68,7 @@ QApplication.restoreOverrideCursor() parent = isinstance(self, QWidget) and self or None dlg = SvnLoginDialog(realm, username, may_save, parent) - res = dlg.exec_() + res = dlg.exec() if cursor is not None: QApplication.setOverrideCursor(Qt.WaitCursor) if res == QDialog.Accepted: @@ -118,7 +118,7 @@ tempButton = msgBox.addButton(self.tr("&Temporary accept"), E5MessageBox.AcceptRole) msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole) - msgBox.exec_() + msgBox.exec() if cursor is not None: QApplication.setOverrideCursor(Qt.WaitCursor) if msgBox.clickedButton() == permButton: @@ -140,7 +140,7 @@ else: # call CommitDialog and get message from there dlg = SvnCommitDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: msg = dlg.logMessage() if msg: return True, msg
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnNewProjectOptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -90,7 +90,7 @@ dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start( self.protocolCombo.currentText() + self.vcsUrlPicker.text()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: url = dlg.getSelectedUrl() if url: protocol = url.split("://")[0]
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/SvnOptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -66,7 +66,7 @@ dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start( self.protocolCombo.currentText() + self.vcsUrlPicker.text()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: url = dlg.getSelectedUrl() if url: protocol = url.split("://")[0]
--- a/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsPySvn/subversion.py Tue Oct 06 17:52:44 2020 +0200 @@ -328,7 +328,7 @@ rev and dlg.showMessage(self.tr("Imported revision {0}.\n") .format(rev.number)) dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) shutil.rmtree(tmpDir, True) @@ -402,7 +402,7 @@ locker.unlock() if not noDialog: dlg.finish() - dlg.exec_() + dlg.exec() return status def vcsExport(self, vcsDataDict, projectDir): @@ -466,7 +466,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() return status def vcsCommit(self, name, message, noDialog=False): @@ -604,7 +604,7 @@ rev and dlg.showMessage(self.tr("Committed revision {0}.") .format(rev.number)) dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) self.committed.emit() self.checkVCSStatus() @@ -647,7 +647,7 @@ locker.unlock() if not noDialog: dlg.finish() - dlg.exec_() + dlg.exec() res = dlg.hasAddOrDelete() else: res = False @@ -762,7 +762,7 @@ locker.unlock() if not noDialog: dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def vcsAddBinary(self, name, isDir=False): @@ -868,7 +868,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def vcsRemove(self, name, project=False, noDialog=False): @@ -910,7 +910,7 @@ locker.unlock() if not noDialog: dlg.finish() - dlg.exec_() + dlg.exec() return res @@ -936,7 +936,7 @@ else: from .SvnCopyDialog import SvnCopyDialog dlg = SvnCopyDialog(name, None, True, "--force" in opts) - accepted = (dlg.exec_() == QDialog.Accepted) + accepted = (dlg.exec() == QDialog.Accepted) if accepted: target, force = dlg.getData() if not target: @@ -975,7 +975,7 @@ locker.unlock() if not noDialog: dlg.finish() - dlg.exec_() + dlg.exec() if res and not rx_prot.exactMatch(target): if target.startswith(project.getProjectPath()): if isDir: @@ -1065,7 +1065,7 @@ from .SvnTagDialog import SvnTagDialog dlg = SvnTagDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, tagOp = dlg.getParameters() if tag in self.allTagsBranchesList: self.allTagsBranchesList.remove(tag) @@ -1127,7 +1127,7 @@ rev and dlg.showMessage( self.tr("Revision {0}.\n").format(rev.number)) dlg.finish() - dlg.exec_() + dlg.exec() def vcsRevert(self, name): """ @@ -1154,7 +1154,7 @@ "Do you really want to revert all changes to these files" " or directories?"), name) - yes = dia.exec_() == QDialog.Accepted + yes = dia.exec() == QDialog.Accepted else: yes = E5MessageBox.yesNo( None, @@ -1177,7 +1177,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() self.checkVCSStatus() def vcsSwitch(self, name): @@ -1208,7 +1208,7 @@ from .SvnSwitchDialog import SvnSwitchDialog dlg = SvnSwitchDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, tagType = dlg.getParameters() if tag in self.allTagsBranchesList: self.allTagsBranchesList.remove(tag) @@ -1254,7 +1254,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() res = dlg.hasAddOrDelete() self.checkVCSStatus() return res @@ -1271,7 +1271,7 @@ from .SvnMergeDialog import SvnMergeDialog dlg = SvnMergeDialog(self.mergeList[0], self.mergeList[1], self.mergeList[2], "--force" in opts) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: urlrev1, urlrev2, target, force = dlg.getParameters() else: return @@ -1361,7 +1361,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def vcsRegisteredState(self, name): @@ -1659,7 +1659,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() def vcsCommandLine(self, name): """ @@ -1669,7 +1669,7 @@ """ from .SvnCommandDialog import SvnCommandDialog dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: command, wd = dlg.getData() commandList = Utilities.parseOptionString(command) @@ -1691,7 +1691,7 @@ dia = SvnProcessDialog(self.tr('Subversion command')) res = dia.startProcess(args, wd) if res: - dia.exec_() + dia.exec() def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ @@ -1819,7 +1819,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) self.checkVCSStatus() @@ -1835,7 +1835,7 @@ rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+') dlg = SvnCopyDialog(name) res = False - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: target, force = dlg.getData() client = self.getClient() @@ -1861,7 +1861,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() if ( res and not rx_prot.exactMatch(target) and @@ -1897,7 +1897,7 @@ """ from .SvnPropSetDialog import SvnPropSetDialog dlg = SvnPropSetDialog(recursive) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: propName, propValue, recurse = dlg.getData() if not propName: E5MessageBox.critical( @@ -1937,7 +1937,7 @@ locker.unlock() dlg.showMessage(self.tr("Property set.")) dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def svnDelProp(self, name, recursive=False): @@ -1949,7 +1949,7 @@ """ from .SvnPropDelDialog import SvnPropDelDialog dlg = SvnPropDelDialog(recursive) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: propName, recurse = dlg.getData() if not propName: @@ -1989,7 +1989,7 @@ locker.unlock() dlg.showMessage(self.tr("Property deleted.")) dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def svnListTagBranch(self, path, tags=True): @@ -2068,7 +2068,7 @@ return from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revisions = dlg.getRevisions() if self.diff is None: from .SvnDiffDialog import SvnDiffDialog @@ -2111,7 +2111,7 @@ from .SvnUrlSelectionDialog import SvnUrlSelectionDialog dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: urls, summary = dlg.getURLs() if self.diff is None: from .SvnDiffDialog import SvnDiffDialog @@ -2180,7 +2180,7 @@ if extended: from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() if rev1 == "WORKING": rev1 = "" @@ -2294,7 +2294,7 @@ dlg.showError(str(e)) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def svnUnlock(self, name, breakIt=False, parent=None): @@ -2331,7 +2331,7 @@ dlg.showError(str(e)) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() os.chdir(cwd) def svnInfo(self, projectPath, name): @@ -2344,7 +2344,7 @@ from .SvnInfoDialog import SvnInfoDialog dlg = SvnInfoDialog(self) dlg.start(projectPath, name) - dlg.exec_() + dlg.exec() def svnRelocate(self, projectPath): """ @@ -2355,7 +2355,7 @@ from .SvnRelocateDialog import SvnRelocateDialog currUrl = self.svnGetReposName(projectPath) dlg = SvnRelocateDialog(currUrl) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: newUrl, inside = dlg.getData() if inside: msg = "switch {0} {1}".format(newUrl, projectPath) @@ -2375,7 +2375,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() def svnRepoBrowser(self, projectPath=None): """ @@ -2429,7 +2429,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() def svnAddToChangelist(self, names): """ @@ -2467,7 +2467,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() def svnShowChangelists(self, path): """ @@ -2524,7 +2524,7 @@ dlg.showError(e.args[0]) locker.unlock() dlg.finish() - dlg.exec_() + dlg.exec() ########################################################################### ## Private Subversion specific methods are below.
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnNewProjectOptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -89,7 +89,7 @@ dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start( self.protocolCombo.currentText() + self.vcsUrlPicker.text()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: url = dlg.getSelectedUrl() if url: protocol = url.split("://")[0]
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/SvnOptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -66,7 +66,7 @@ dlg = SvnRepoBrowserDialog(self.vcs, mode="select", parent=self) dlg.start( self.protocolCombo.currentText() + self.vcsUrlPicker.text()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: url = dlg.getSelectedUrl() if url: protocol = url.split("://")[0]
--- a/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/VcsPlugins/vcsSubversion/subversion.py Tue Oct 06 17:52:44 2020 +0200 @@ -324,7 +324,7 @@ self.tr('Importing project into Subversion repository')) res = dia.startProcess(args, os.path.join(tmpDir, project)) if res: - dia.exec_() + dia.exec() status = dia.normalExit() shutil.rmtree(tmpDir, True) @@ -389,7 +389,7 @@ self.tr('Checking project out of Subversion repository')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() return dia.normalExit() def vcsExport(self, vcsDataDict, projectDir): @@ -444,7 +444,7 @@ self.tr('Exporting project from Subversion repository')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() return dia.normalExit() def vcsCommit(self, name, message, noDialog=False): @@ -568,7 +568,7 @@ self.tr('Commiting changes to Subversion repository')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() self.committed.emit() self.checkVCSStatus() @@ -605,7 +605,7 @@ self.tr('Synchronizing with the Subversion repository')) res = dia.startProcess(args, dname, True) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -705,7 +705,7 @@ ' repository')) res = dia.startProcess(args, wdir) if res: - dia.exec_() + dia.exec() def vcsAddBinary(self, name, isDir=False): """ @@ -796,7 +796,7 @@ self.tr('Adding directory trees to the Subversion repository')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def vcsRemove(self, name, project=False, noDialog=False): """ @@ -832,7 +832,7 @@ ' repository')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() res = dia.normalExit() return res @@ -862,7 +862,7 @@ else: from .SvnCopyDialog import SvnCopyDialog dlg = SvnCopyDialog(name, None, True, force) - accepted = (dlg.exec_() == QDialog.Accepted) + accepted = (dlg.exec() == QDialog.Accepted) if accepted: target, force = dlg.getData() if not target: @@ -893,7 +893,7 @@ .format(name)) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() res = dia.normalExit() if res and not rx_prot.exactMatch(target): if target.startswith(project.getProjectPath()): @@ -983,7 +983,7 @@ from .SvnTagDialog import SvnTagDialog dlg = SvnTagDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, tagOp = dlg.getParameters() if tag in self.allTagsBranchesList: self.allTagsBranchesList.remove(tag) @@ -1032,7 +1032,7 @@ .format(name)) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() def vcsRevert(self, name): """ @@ -1064,7 +1064,7 @@ self.tr("Do you really want to revert all changes to" " these files or directories?"), names) - yes = dlg.exec_() == QDialog.Accepted + yes = dlg.exec() == QDialog.Accepted else: yes = E5MessageBox.yesNo( None, @@ -1075,7 +1075,7 @@ dia = SvnDialog(self.tr('Reverting changes')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def vcsSwitch(self, name): @@ -1105,7 +1105,7 @@ from .SvnSwitchDialog import SvnSwitchDialog dlg = SvnSwitchDialog(self.allTagsBranchesList, url, self.otherData["standardLayout"]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: tag, tagType = dlg.getParameters() if tag in self.allTagsBranchesList: self.allTagsBranchesList.remove(tag) @@ -1150,7 +1150,7 @@ .format(tn)) res = dia.startProcess(args, setLanguage=True) if res: - dia.exec_() + dia.exec() res = dia.hasAddOrDelete() self.checkVCSStatus() return res @@ -1171,7 +1171,7 @@ from .SvnMergeDialog import SvnMergeDialog dlg = SvnMergeDialog( self.mergeList[0], self.mergeList[1], self.mergeList[2], force) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: urlrev1, urlrev2, target, force = dlg.getParameters() else: return @@ -1214,7 +1214,7 @@ dia = SvnDialog(self.tr('Merging {0}').format(name)) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def vcsRegisteredState(self, name): """ @@ -1481,7 +1481,7 @@ .format(name)) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() def vcsCommandLine(self, name): """ @@ -1491,7 +1491,7 @@ """ from .SvnCommandDialog import SvnCommandDialog dlg = SvnCommandDialog(self.commandHistory, self.wdHistory, name) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: command, wd = dlg.getData() commandList = Utilities.parseOptionString(command) @@ -1510,7 +1510,7 @@ dia = SvnDialog(self.tr('Subversion command')) res = dia.startProcess(args, wd) if res: - dia.exec_() + dia.exec() def vcsOptionsDialog(self, project, archive, editable=False, parent=None): """ @@ -1685,7 +1685,7 @@ dia = SvnDialog(self.tr('Resolving conficts')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() self.checkVCSStatus() def svnCopy(self, name, project): @@ -1700,7 +1700,7 @@ rx_prot = QRegExp('(file:|svn:|svn+ssh:|http:|https:).+') dlg = SvnCopyDialog(name) res = False - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: target, force = dlg.getData() args = [] @@ -1717,7 +1717,7 @@ .format(name)) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() res = dia.normalExit() if ( res and @@ -1753,7 +1753,7 @@ """ from .SvnPropSetDialog import SvnPropSetDialog dlg = SvnPropSetDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: propName, fileFlag, propValue = dlg.getData() if not propName: E5MessageBox.critical( @@ -1782,7 +1782,7 @@ dia = SvnDialog(self.tr('Subversion Set Property')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnDelProp(self, name, recursive=False): """ @@ -1824,7 +1824,7 @@ dia = SvnDialog(self.tr('Subversion Delete Property')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnListTagBranch(self, path, tags=True): """ @@ -1900,7 +1900,7 @@ return from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: revisions = dlg.getRevisions() from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) @@ -1940,7 +1940,7 @@ from .SvnUrlSelectionDialog import SvnUrlSelectionDialog dlg = SvnUrlSelectionDialog(self, self.tagsList, self.branchesList, dname) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: urls, summary = dlg.getURLs() from .SvnDiffDialog import SvnDiffDialog self.diff = SvnDiffDialog(self) @@ -2007,7 +2007,7 @@ if extended: from .SvnRevisionSelectionDialog import SvnRevisionSelectionDialog dlg = SvnRevisionSelectionDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: rev1, rev2 = dlg.getRevisions() if rev1 == "WORKING": rev1 = "" @@ -2101,7 +2101,7 @@ self.tr('Locking in the Subversion repository'), parent) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnUnlock(self, name, breakIt=False, parent=None): """ @@ -2129,7 +2129,7 @@ self.tr('Unlocking in the Subversion repository'), parent) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnRelocate(self, projectPath): """ @@ -2140,7 +2140,7 @@ from .SvnRelocateDialog import SvnRelocateDialog currUrl = self.svnGetReposName(projectPath) dlg = SvnRelocateDialog(currUrl) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: newUrl, inside = dlg.getData() args = [] args.append('switch') @@ -2153,7 +2153,7 @@ dia = SvnDialog(self.tr('Relocating')) res = dia.startProcess(args) if res: - dia.exec_() + dia.exec() def svnRepoBrowser(self, projectPath=None): """ @@ -2206,7 +2206,7 @@ dia = SvnDialog(self.tr('Remove from changelist')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnAddToChangelist(self, names): """ @@ -2241,7 +2241,7 @@ dia = SvnDialog(self.tr('Remove from changelist')) res = dia.startProcess(args, dname) if res: - dia.exec_() + dia.exec() def svnShowChangelists(self, path): """ @@ -2304,7 +2304,7 @@ dia = SvnDialog(self.tr('Upgrade')) res = dia.startProcess(args, path) if res: - dia.exec_() + dia.exec() ########################################################################### ## Private Subversion specific methods are below.
--- a/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Oct 06 17:52:44 2020 +0200 @@ -107,9 +107,9 @@ str(id(self.parentWidget())).encode("utf-8")) drag.setMimeData(mimeData) if event.modifiers() == Qt.KeyboardModifiers(Qt.ShiftModifier): - drag.exec_(Qt.DropActions(Qt.CopyAction)) + drag.exec(Qt.DropActions(Qt.CopyAction)) elif event.modifiers() == Qt.KeyboardModifiers(Qt.NoModifier): - drag.exec_(Qt.DropActions(Qt.MoveAction)) + drag.exec(Qt.DropActions(Qt.MoveAction)) super(TabBar, self).mouseMoveEvent(event) def dragEnterEvent(self, event):
--- a/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/DotDesktopWizard/DotDesktopWizardDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -269,7 +269,7 @@ self.categoriesEdit.text(), ";", subEntries=self.__subCategories, allowMultiMain=False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: categories = dlg.getData(";", True) self.categoriesEdit.setText(categories) @@ -299,7 +299,7 @@ dlg = DotDesktopListSelectionDialog( self.__showinEnvironments, self.onlyShowEdit.text(), ";") - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: environments = dlg.getData(";", True) self.onlyShowEdit.setText(environments) @@ -329,7 +329,7 @@ dlg = DotDesktopListSelectionDialog( self.__showinEnvironments, self.notShowEdit.text(), ";") - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: environments = dlg.getData(";", True) self.notShowEdit.setText(environments)
--- a/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -265,7 +265,7 @@ """ from .PyRegExpWizardRepeatDialog import PyRegExpWizardRepeatDialog dlg = PyRegExpWizardRepeatDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @pyqtSlot() @@ -277,7 +277,7 @@ PyRegExpWizardCharactersDialog ) dlg = PyRegExpWizardCharactersDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getCharacters()) @pyqtSlot()
--- a/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -229,7 +229,7 @@ """ from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog dlg = QRegExpWizardRepeatDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @pyqtSlot() @@ -242,7 +242,7 @@ ) dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.RegExpMode, parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getCharacters()) @pyqtSlot() @@ -255,7 +255,7 @@ ) dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.WildcardMode, parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getCharacters()) @pyqtSlot() @@ -282,7 +282,7 @@ ) dlg = QRegExpWizardCharactersDialog( mode=QRegExpWizardCharactersDialog.W3CMode, parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getCharacters()) @pyqtSlot() @@ -299,7 +299,7 @@ """ from .QRegExpWizardRepeatDialog import QRegExpWizardRepeatDialog dlg = QRegExpWizardRepeatDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @pyqtSlot()
--- a/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Plugins/WizardPlugins/QRegularExpressionWizard/QRegularExpressionWizardDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -221,7 +221,7 @@ QRegularExpressionWizardCharactersDialog ) dlg = QRegularExpressionWizardCharactersDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getCharacters()) @pyqtSlot() @@ -240,7 +240,7 @@ QRegularExpressionWizardRepeatDialog ) dlg = QRegularExpressionWizardRepeatDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__insertString(dlg.getRepeat()) @pyqtSlot()
--- a/eric6/Preferences/ConfigurationPages/ConfigurationPageBase.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/ConfigurationPageBase.py Tue Oct 06 17:52:44 2020 +0200 @@ -91,7 +91,7 @@ colDlg.setCurrentColor(self.__coloursDict[colorKey][0]) colDlg.currentColorChanged.connect( lambda col: self.colourChanged.emit(colorKey, col)) - colDlg.exec_() + colDlg.exec() if colDlg.result() == colDlg.Accepted: colour = colDlg.selectedColor()
--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -209,7 +209,7 @@ tabWidth=self.tabwidthSlider.value(), indentWidth=self.indentwidthSlider.value(), ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: language, tabWidth, indentWidth = dlg.getData() self.__createOverrideItem(language, tabWidth, indentWidth) self.languageOverrideWidget.sortItems(0, Qt.AscendingOrder) @@ -242,7 +242,7 @@ tabWidth=int(itm.text(1)), indentWidth=int(itm.text(2)), ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: language, tabWidth, indentWidth = dlg.getData() itm.setText(1, "{0:2d}".format(tabWidth)) itm.setText(2, "{0:2d}".format(indentWidth))
--- a/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/EditorHighlightingStylesPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -662,7 +662,7 @@ style, substyle = self.__currentStyles() dlg = SubstyleDefinitionDialog( self.lexer, style, substyle, parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: description, words = dlg.getData() substyle = self.lexer.addSubstyle(style) self.lexer.setDescription(description, style, substyle) @@ -706,7 +706,7 @@ style, substyle = self.__currentStyles() dlg = SubstyleDefinitionDialog( self.lexer, style, substyle, parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: description, words = dlg.getData() self.lexer.setDescription(description, style, substyle) self.lexer.setWords(words, style, substyle)
--- a/eric6/Preferences/ConfigurationPages/IconsPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/IconsPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -189,7 +189,7 @@ if directories: from .IconsPreviewDialog import IconsPreviewDialog dlg = IconsPreviewDialog(directories, self) - dlg.exec_() + dlg.exec() @pyqtSlot() def on_showDefaultIconsButton_clicked(self): @@ -209,7 +209,7 @@ os.path.join(getConfig('ericIconDir'), defaultIconsPath, "languages"), ], self) - dlg.exec_() + dlg.exec() def create(dlg):
--- a/eric6/Preferences/ConfigurationPages/SecurityPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/SecurityPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -101,7 +101,7 @@ if checked: from .MasterPasswordEntryDialog import MasterPasswordEntryDialog dlg = MasterPasswordEntryDialog("", self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: Preferences.setUser( "MasterPassword", dlg.getMasterPassword()) @@ -121,7 +121,7 @@ from .MasterPasswordEntryDialog import MasterPasswordEntryDialog dlg = MasterPasswordEntryDialog( Preferences.getUser("MasterPassword"), self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: Preferences.setUser( "MasterPassword", dlg.getMasterPassword())
--- a/eric6/Preferences/ConfigurationPages/WebBrowserPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -491,7 +491,7 @@ from WebBrowser.Network.SendRefererWhitelistDialog import ( SendRefererWhitelistDialog ) - SendRefererWhitelistDialog(self).exec_() + SendRefererWhitelistDialog(self).exec() def create(dlg):
--- a/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Preferences/ConfigurationPages/WebBrowserSpellCheckingPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -177,7 +177,7 @@ ManageDictionariesDialog ) dlg = ManageDictionariesDialog(self.__writeableDirectories, self) - dlg.exec_() + dlg.exec() self.__populateDictionariesList()
--- a/eric6/Project/CreateDialogCodeDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/CreateDialogCodeDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -603,7 +603,7 @@ objName = self.__objectName() if objName: dlg = NewDialogClassDialog(objName, file, path, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: className, fileName = dlg.getData() self.classNameCombo.clear()
--- a/eric6/Project/IdlCompilerOptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/IdlCompilerOptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -270,7 +270,7 @@ Private slot to add a 'Define Name' entry. """ dlg = IdlCompilerDefineNameDialog(parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, value = dlg.getData() if not self.__definedNamesContain(name): QTreeWidgetItem(self.dnList, [name, value]) @@ -296,7 +296,7 @@ dlg = IdlCompilerDefineNameDialog( name=itm.text(0), value=itm.text(1), parent=self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, value = dlg.getData() if self.__definedNamesContain(name) and itm.text(0) != name: # the entry exists already, delete the edited one
--- a/eric6/Project/Project.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/Project.py Tue Oct 06 17:52:44 2020 +0200 @@ -1284,7 +1284,7 @@ """ from .DebuggerPropertiesDialog import DebuggerPropertiesDialog dlg = DebuggerPropertiesDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.storeData() def getDebugProperty(self, key): @@ -1376,7 +1376,7 @@ from .AddLanguageDialog import AddLanguageDialog dlg = AddLanguageDialog(self.parent()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: lang = dlg.getSelectedLanguage() if self.pdata["PROJECTTYPE"] in [ "PyQt5", "PyQt5C", "E6Plugin", "PySide2", "PySide2C" @@ -1620,7 +1620,7 @@ from .AddFileDialog import AddFileDialog dlg = AddFileDialog(self, self.parent(), fileTypeFilter, startdir=startdir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: fnames, target, isSource = dlg.getData() if target != '': for fn in fnames: @@ -1786,7 +1786,7 @@ from .AddDirectoryDialog import AddDirectoryDialog dlg = AddDirectoryDialog( self, fileTypeFilter, self.parent(), startdir=startdir) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: filetype, source, target, recursive = dlg.getData() if target == '': E5MessageBox.critical( @@ -2284,7 +2284,7 @@ from .PropertiesDialog import PropertiesDialog dlg = PropertiesDialog(self, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.closeProject() dlg.storeData() self.pdata["VCS"] = 'None' @@ -2518,7 +2518,7 @@ VcsCommandOptionsDialog ) codlg = VcsCommandOptionsDialog(self.vcs) - if codlg.exec_() == QDialog.Accepted: + if codlg.exec() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) # add project file to repository if res == 0: @@ -2570,7 +2570,7 @@ self.vcs = self.initVCS() if self.vcs is not None: vcsdlg = self.vcs.vcsOptionsDialog(self, self.name) - if vcsdlg.exec_() == QDialog.Accepted: + if vcsdlg.exec() == QDialog.Accepted: vcsDataDict = vcsdlg.getData() else: self.pdata["VCS"] = 'None' @@ -2592,7 +2592,7 @@ VcsCommandOptionsDialog ) codlg = VcsCommandOptionsDialog(self.vcs) - if codlg.exec_() == QDialog.Accepted: + if codlg.exec() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) # create the project in the VCS @@ -2709,7 +2709,7 @@ """ from .PropertiesDialog import PropertiesDialog dlg = PropertiesDialog(self, False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: projectType = self.pdata["PROJECTTYPE"] dlg.storeData() self.setDirty(True) @@ -2784,7 +2784,7 @@ from .UserPropertiesDialog import UserPropertiesDialog dlg = UserPropertiesDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.storeData() if ( @@ -2829,7 +2829,7 @@ """ from .FiletypeAssociationDialog import FiletypeAssociationDialog dlg = FiletypeAssociationDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.transferData() self.setDirty(True) self.__reorganizeFiles() @@ -2840,7 +2840,7 @@ """ from .LexerAssociationDialog import LexerAssociationDialog dlg = LexerAssociationDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.transferData() self.setDirty(True) self.lexerAssociationsChanged.emit() @@ -4700,7 +4700,7 @@ # autoInclude is not set, show a dialog from .AddFoundFilesDialog import AddFoundFilesDialog dlg = AddFoundFilesDialog(newFiles, self.parent(), None) - res = dlg.exec_() + res = dlg.exec() # the 'Add All' button was pressed if res == 1: @@ -5324,7 +5324,7 @@ sorted(pkglists), title=self.tr("Create Plugin Archive"), message=self.tr("Select package lists:"), checkBoxSelection=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: selectedLists = [os.path.join(self.ppath, s) for s in dlg.getSelection()] else:
--- a/eric6/Project/ProjectBaseBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectBaseBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -302,7 +302,7 @@ " the project?"), dirs) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for dn in fullNames: self.project.deleteDirectory(dn)
--- a/eric6/Project/ProjectFormsBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectFormsBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -657,7 +657,7 @@ "Do you really want to delete these forms from the project?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn2, fn in zip(fullNames, files): self.closeSourceWindow.emit(fn2) self.project.deleteFile(fn) @@ -891,7 +891,7 @@ dlg = CreateDialogCodeDialog(fn, self.project, self) if not dlg.initError(): - dlg.exec_() + dlg.exec() # reset the environment os.chdir(cwd) @@ -1065,7 +1065,7 @@ if self.project.getProjectType() in ["PyQt5", "E6Plugin"]: dlg = UicCompilerOptionsDialog(params, self.getUiCompiler()) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: package, suffix, root = dlg.getData() if package != params["Package"]: params["Package"] = package
--- a/eric6/Project/ProjectInterfacesBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectInterfacesBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -464,7 +464,7 @@ " the project?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn2, fn in zip(fullNames, files): self.closeSourceWindow.emit(fn2) self.project.deleteFile(fn) @@ -693,7 +693,7 @@ dlg = IdlCompilerOptionsDialog( params["IncludeDirs"][:], params["DefinedNames"][:], params["UndefinedNames"][:], self.project, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: include, defined, undefined = dlg.getData() if include != params["IncludeDirs"]: params["IncludeDirs"] = include[:]
--- a/eric6/Project/ProjectOthersBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectOthersBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -357,7 +357,7 @@ " project?"), names) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for itm, fn2, fn in zip(items[:], fullNames, names): if isinstance(itm, ProjectBrowserFileItem): self.closeSourceWindow.emit(fn2)
--- a/eric6/Project/ProjectProtocolsBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectProtocolsBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -456,7 +456,7 @@ " the project?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn2, fn in zip(fullNames, files): self.closeSourceWindow.emit(fn2) self.project.deleteFile(fn)
--- a/eric6/Project/ProjectResourcesBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectResourcesBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -538,7 +538,7 @@ " project?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn2, fn in zip(fullNames, files): self.closeSourceWindow.emit(fn2) self.project.deleteFile(fn) @@ -928,7 +928,7 @@ params = self.project.pdata["RCCPARAMS"] dlg = RccCompilerOptionsDialog(params) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: threshold, compression, noCompression, root = dlg.getData() if threshold != params["CompressionThreshold"]: params["CompressionThreshold"] = threshold
--- a/eric6/Project/ProjectSourcesBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectSourcesBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -815,7 +815,7 @@ dn = dn[1:] from .NewPythonPackageDialog import NewPythonPackageDialog dlg = NewPythonPackageDialog(dn, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: packageName = dlg.getData() nameParts = packageName.split(".") packagePath = self.project.ppath @@ -916,7 +916,7 @@ "Do you really want to delete these files from the project?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn2, fn in zip(fullNames, files): self.closeSourceWindow.emit(fn2) self.project.deleteFile(fn)
--- a/eric6/Project/ProjectTranslationsBrowser.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/ProjectTranslationsBrowser.py Tue Oct 06 17:52:44 2020 +0200 @@ -682,7 +682,7 @@ " from the project?"), translationFiles) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for fn in translationFiles: self.closeSourceWindow.emit(fn) self.project.deleteLanguageFile(fn)
--- a/eric6/Project/PropertiesDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Project/PropertiesDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -181,7 +181,7 @@ from .SpellingPropertiesDialog import SpellingPropertiesDialog self.spellPropertiesDlg = SpellingPropertiesDialog( self.project, self.newProject, self) - res = self.spellPropertiesDlg.exec_() + res = self.spellPropertiesDlg.exec() if res == QDialog.Rejected: self.spellPropertiesDlg.initDialog() # reset the dialogs contents @@ -198,7 +198,7 @@ self.project, self.newProject, self) else: self.transPropertiesDlg.initFilters() - res = self.transPropertiesDlg.exec_() + res = self.transPropertiesDlg.exec() if res == QDialog.Rejected: self.transPropertiesDlg.initDialog() # reset the dialogs contents @@ -211,7 +211,7 @@ from .MakePropertiesDialog import MakePropertiesDialog self.makePropertiesDlg = MakePropertiesDialog( self.project, self.newProject, self) - res = self.makePropertiesDlg.exec_() + res = self.makePropertiesDlg.exec() if res == QDialog.Rejected: self.makePropertiesDlg.initDialog() @@ -252,7 +252,7 @@ from VCS.RepositoryInfoDialog import VcsRepositoryInfoDialog info = self.project.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(self, info) - dlg.exec_() + dlg.exec() def getProjectType(self): """
--- a/eric6/PyUnit/UnittestDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/PyUnit/UnittestDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -1152,7 +1152,7 @@ # and now fire it up self.dlg.show() - self.dlg.exec_() + self.dlg.exec() def __showSource(self): """
--- a/eric6/QScintilla/Editor.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/Editor.py Tue Oct 06 17:52:44 2020 +0200 @@ -2464,7 +2464,7 @@ (self.fileName, ln), (cond, temp, enabled, ignorecount), self.condHistory, self, modal=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: cond, temp, enabled, ignorecount = dlg.getData() self.breakpointModel.setBreakPointByIndex( index, self.fileName, ln, @@ -2657,7 +2657,7 @@ printDialog = QPrintDialog(printer, self) if self.hasSelectedText(): printDialog.setOption(QAbstractPrintDialog.PrintSelection, True) - if printDialog.exec_() == QDialog.Accepted: + if printDialog.exec() == QDialog.Accepted: sb.showMessage(self.tr('Printing...')) QApplication.processEvents() fn = self.getFileName() @@ -2698,7 +2698,7 @@ printer.setDocName(self.noName) preview = QPrintPreviewDialog(printer, self) preview.paintRequested.connect(self.__printPreview) - preview.exec_() + preview.exec() def __printPreview(self, printer): """ @@ -7420,7 +7420,7 @@ """ from Project.AddLanguageDialog import AddLanguageDialog dlg = AddLanguageDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: lang = dlg.getSelectedLanguage() line, index = self.getCursorPosition() self.insert('<qresource lang="{0}">\n</qresource>\n'.format(lang)) @@ -7790,7 +7790,7 @@ cline, cindex = self.getCursorPosition() from .SpellCheckingDialog import SpellCheckingDialog dlg = SpellCheckingDialog(self.spell, 0, self.length(), self) - dlg.exec_() + dlg.exec() self.setCursorPosition(cline, cindex) if Preferences.getEditor("AutoSpellCheckingEnabled"): self.spell.checkDocumentIncrementally() @@ -7804,7 +7804,7 @@ startPos = self.positionFromLineIndex(sline, sindex) endPos = self.positionFromLineIndex(eline, eindex) dlg = SpellCheckingDialog(self.spell, startPos, endPos, self) - dlg.exec_() + dlg.exec() def __checkSpellingWord(self): """ @@ -7816,7 +7816,7 @@ wordStartPos = self.positionFromLineIndex(line, wordStart) wordEndPos = self.positionFromLineIndex(line, wordEnd) dlg = SpellCheckingDialog(self.spell, wordStartPos, wordEndPos, self) - dlg.exec_() + dlg.exec() def __showContextMenuSpelling(self): """ @@ -8231,7 +8231,7 @@ from .SortOptionsDialog import SortOptionsDialog dlg = SortOptionsDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: ascending, alnum, caseSensitive = dlg.getData() origStartLine, origStartIndex, origEndLine, origEndIndex = ( self.getRectangularSelection()
--- a/eric6/QScintilla/MarkupProviders/HtmlProvider.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/MarkupProviders/HtmlProvider.py Tue Oct 06 17:52:44 2020 +0200 @@ -215,7 +215,7 @@ from .HyperlinkMarkupDialog import HyperlinkMarkupDialog dlg = HyperlinkMarkupDialog(True, False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: text, target, title = dlg.getData() if not text: text = target @@ -297,7 +297,7 @@ from .ImageMarkupDialog import ImageMarkupDialog dlg = ImageMarkupDialog(ImageMarkupDialog.HtmlMode) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: address, altText, title, originalSize, width, height = ( dlg.getData() )
--- a/eric6/QScintilla/MarkupProviders/MarkdownProvider.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/MarkupProviders/MarkdownProvider.py Tue Oct 06 17:52:44 2020 +0200 @@ -210,7 +210,7 @@ from .HyperlinkMarkupDialog import HyperlinkMarkupDialog dlg = HyperlinkMarkupDialog(False, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: text, target, title = dlg.getData() link = "[{0}]".format(text) @@ -301,7 +301,7 @@ from .ImageMarkupDialog import ImageMarkupDialog dlg = ImageMarkupDialog(ImageMarkupDialog.MarkDownMode) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: address, altText, title, originalSize, width, height = ( dlg.getData() )
--- a/eric6/QScintilla/MarkupProviders/RestructuredTextProvider.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/MarkupProviders/RestructuredTextProvider.py Tue Oct 06 17:52:44 2020 +0200 @@ -207,7 +207,7 @@ from .HyperlinkMarkupDialog import HyperlinkMarkupDialog dlg = HyperlinkMarkupDialog(False, True, noTitle=True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: text, target, _ = dlg.getData() link1 = "`{0}`_".format(text) @@ -323,7 +323,7 @@ from .ImageMarkupDialog import ImageMarkupDialog dlg = ImageMarkupDialog(ImageMarkupDialog.RestMode) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: address, altText, title, originalSize, width, height = ( dlg.getData() )
--- a/eric6/QScintilla/MiniEditor.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/MiniEditor.py Tue Oct 06 17:52:44 2020 +0200 @@ -2862,7 +2862,7 @@ printDialog = QPrintDialog(printer, self) if self.__textEdit.hasSelectedText(): printDialog.setOption(QAbstractPrintDialog.PrintSelection, True) - if printDialog.exec_() == QDialog.Accepted: + if printDialog.exec() == QDialog.Accepted: sb.showMessage(self.tr('Printing...')) QApplication.processEvents() if self.__curFile: @@ -2903,7 +2903,7 @@ printer.setDocName(self.tr("Untitled")) preview = QPrintPreviewDialog(printer, self) preview.paintRequested.connect(self.__printPreview) - preview.exec_() + preview.exec() def __printPreview(self, printer): """ @@ -3013,7 +3013,7 @@ @param pos position the menu should be shown at (QPoint) """ - self.languagesMenu.exec_(pos) + self.languagesMenu.exec(pos) def __selectPygmentsLexer(self): """
--- a/eric6/QScintilla/Shell.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/Shell.py Tue Oct 06 17:52:44 2020 +0200 @@ -780,7 +780,7 @@ """ from .ShellHistoryDialog import ShellHistoryDialog dlg = ShellHistoryDialog(self.__history, self.vm, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__historyLists[self.clientType], idx = dlg.getHistory() self.__history = self.__historyLists[self.clientType] self.__setHistoryIndex(index=idx)
--- a/eric6/QScintilla/ShellWindow.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/QScintilla/ShellWindow.py Tue Oct 06 17:52:44 2020 +0200 @@ -1067,7 +1067,7 @@ """ from QScintilla.ZoomDialog import ZoomDialog dlg = ZoomDialog(self.__shell.getZoom(), self, None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: value = dlg.getZoomSize() self.__zoomTo(value)
--- a/eric6/Snapshot/SnapWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Snapshot/SnapWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -381,7 +381,7 @@ mimeData.setImageData(self.__snapshot) drag.setMimeData(mimeData) drag.setPixmap(self.preview.pixmap()) - drag.exec_(Qt.CopyAction) + drag.exec(Qt.CopyAction) def closeEvent(self, evt): """
--- a/eric6/SqlBrowser/SqlBrowserWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/SqlBrowser/SqlBrowserWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -154,7 +154,7 @@ """ from .SqlConnectionDialog import SqlConnectionDialog dlg = SqlConnectionDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: driver, dbName, user, password, host, port = dlg.getData() err = self.addConnection( driver, dbName, user, password, host, port)
--- a/eric6/Tasks/TaskViewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Tasks/TaskViewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -472,7 +472,7 @@ ro = task.getFilename() != "" if ro: dlg.setReadOnly() - if dlg.exec_() == QDialog.Accepted and not ro: + if dlg.exec() == QDialog.Accepted and not ro: summary, priority, completed, isProjectTask, description = ( dlg.getData() ) @@ -489,7 +489,7 @@ """ from .TaskPropertiesDialog import TaskPropertiesDialog dlg = TaskPropertiesDialog(None, self, self.projectOpen) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: summary, priority, completed, isProjectTask, description = ( dlg.getData() ) @@ -506,7 +506,7 @@ from .TaskPropertiesDialog import TaskPropertiesDialog dlg = TaskPropertiesDialog(None, self, self.projectOpen) dlg.setSubTaskMode(projectTask) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: summary, priority, completed, isProjectTask, description = ( dlg.getData() ) @@ -668,7 +668,7 @@ """ from .TaskFilterConfigDialog import TaskFilterConfigDialog dlg = TaskFilterConfigDialog(self.taskFilter) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.configureTaskFilter(self.taskFilter) self.__refreshDisplay()
--- a/eric6/Templates/TemplateViewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Templates/TemplateViewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -491,7 +491,7 @@ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self) dlg.setSelectedGroup(groupName) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, description, groupName, template = dlg.getData() self.addEntry(groupName, name, description, template) self.__dirty = True @@ -502,7 +502,7 @@ """ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: name, language = dlg.getData() self.addGroup(name, language) self.__dirty = True @@ -519,7 +519,7 @@ from .TemplatePropertiesDialog import TemplatePropertiesDialog dlg = TemplatePropertiesDialog(self, editGroup, itm) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: if editGroup: name, language = dlg.getData() self.changeGroup(itm.getName(), name, language) @@ -714,7 +714,7 @@ TemplateMultipleVariablesDialog ) dlg = TemplateMultipleVariablesDialog(variables, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: varValues.update(dlg.getVariables()) ok = True else: @@ -723,7 +723,7 @@ ) for var in variables: dlg = TemplateSingleVariableDialog(var, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: varValues[var] = dlg.getVariable() else: return
--- a/eric6/Toolbox/Startup.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Toolbox/Startup.py Tue Oct 06 17:52:44 2020 +0200 @@ -283,7 +283,7 @@ eMsg = E5ErrorMessage.qtHandler() eMsg.setMinimumSize(600, 400) - return app.exec_() + return app.exec() # # eflag: noqa = M801
--- a/eric6/Tools/TrayStarter.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Tools/TrayStarter.py Tue Oct 06 17:52:44 2020 +0200 @@ -478,7 +478,7 @@ dlg.preferencesChanged.connect(self.preferencesChanged) dlg.show() dlg.showConfigurationPageByName("trayStarterPage") - dlg.exec_() + dlg.exec() QApplication.processEvents() if dlg.result() == QDialog.Accepted: dlg.setPreferences() @@ -499,7 +499,7 @@ """ from Plugins.AboutPlugin.AboutDialog import AboutDialog dlg = AboutDialog() - dlg.exec_() + dlg.exec() def __showVersions(self): """
--- a/eric6/Tools/UIPreviewer.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/Tools/UIPreviewer.py Tue Oct 06 17:52:44 2020 +0200 @@ -530,7 +530,7 @@ QPrinter.ColorMode(int(settings.value("UIPreviewer/colormode")))) printDialog = QPrintDialog(printer, self) - if printDialog.exec_() == QDialog.Accepted: + if printDialog.exec() == QDialog.Accepted: self.statusBar().showMessage(self.tr("Printing the image...")) self.__print(printer) @@ -574,7 +574,7 @@ preview = QPrintPreviewDialog(printer, self) preview.paintRequested.connect(self.__print) - preview.exec_() + preview.exec() def __print(self, printer): """
--- a/eric6/UI/FindFileDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/UI/FindFileDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -699,7 +699,7 @@ menu.addAction(self.tr("Copy Path to Clipboard"), self.__copyToClipboard) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def __openFile(self): """
--- a/eric6/UI/Previewers/PreviewerHTML.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/UI/Previewers/PreviewerHTML.py Tue Oct 06 17:52:44 2020 +0200 @@ -314,7 +314,7 @@ self.previewView.page().runJavaScript( script, resultCallback) - loop.exec_() + loop.exec() return resultDict["res"]
--- a/eric6/UI/UserInterface.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/UI/UserInterface.py Tue Oct 06 17:52:44 2020 +0200 @@ -3722,7 +3722,7 @@ if os.path.exists(logFile): from .ErrorLogDialog import ErrorLogDialog dlg = ErrorLogDialog(logFile, False, self) - dlg.exec_() + dlg.exec() def __hasErrorLog(self): """ @@ -4757,7 +4757,7 @@ from Preferences.ToolConfigurationDialog import ToolConfigurationDialog dlg = ToolConfigurationDialog( self.toolGroups[self.currentToolGroup][1], self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.toolGroups[self.currentToolGroup][1] = dlg.getToollist() self.__updateExternalToolsActions() @@ -4770,7 +4770,7 @@ ) dlg = ToolGroupConfigurationDialog( self.toolGroups, self.currentToolGroup, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.toolGroups, self.currentToolGroup = dlg.getToolGroups() def __createUnitTestDialog(self): @@ -5948,7 +5948,7 @@ self.__lastConfigurationPageName) else: self.__configurationDialog.showConfigurationPageByName("empty") - self.__configurationDialog.exec_() + self.__configurationDialog.exec() QApplication.processEvents() if self.__configurationDialog.result() == QDialog.Accepted: self.__configurationDialog.setPreferences() @@ -6089,7 +6089,7 @@ from Preferences.ViewProfileDialog import ViewProfileDialog dlg = ViewProfileDialog(self.__layoutType, self.profiles['edit'][1], self.profiles['debug'][1]) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: edit, debug = dlg.getVisibilities() self.profiles['edit'][1] = edit self.profiles['debug'][1] = debug @@ -6105,7 +6105,7 @@ """ from E5Gui.E5ToolBarDialog import E5ToolBarDialog dlg = E5ToolBarDialog(self.toolbarManager) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: Preferences.setUI( "ToolbarManagerState", self.toolbarManager.saveState()) @@ -6164,7 +6164,7 @@ from E5Network.E5SslCertificatesDialog import E5SslCertificatesDialog dlg = E5SslCertificatesDialog(self) - dlg.exec_() + dlg.exec() def __clearPrivateData(self): """ @@ -6172,7 +6172,7 @@ """ from .ClearPrivateDataDialog import ClearPrivateDataDialog dlg = ClearPrivateDataDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: # recent files, recent projects, recent multi projects, # debug histories, shell histories (files, projects, multiProjects, debug, shell, vcs, plugins) = ( @@ -6629,7 +6629,7 @@ self.pluginManager, [] if pluginFileNames is None else pluginFileNames[:], self) - dlg.exec_() + dlg.exec() if dlg.restartNeeded(): self.__restart(ask=True) @@ -6639,7 +6639,7 @@ """ from PluginManager.PluginUninstallDialog import PluginUninstallDialog dlg = PluginUninstallDialog(self.pluginManager, self) - dlg.exec_() + dlg.exec() def showPluginsAvailable(self): """ @@ -6647,7 +6647,7 @@ """ from PluginManager.PluginRepositoryDialog import PluginRepositoryDialog dlg = PluginRepositoryDialog(self.pluginManager, self) - res = dlg.exec_() + res = dlg.exec() if res == (QDialog.Accepted + 1): self.__installPlugins(dlg.getDownloadedPlugins())
--- a/eric6/VCS/ProjectBrowserHelper.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/VCS/ProjectBrowserHelper.py Tue Oct 06 17:52:44 2020 +0200 @@ -305,7 +305,7 @@ " from the repository (and disk)?"), files) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: status = self.vcs.vcsRemove(names) if status: if isRemoveDirs: @@ -405,7 +405,7 @@ from .RepositoryInfoDialog import VcsRepositoryInfoDialog info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() + dlg.exec() def _updateVCSStatus(self, name): """
--- a/eric6/VCS/ProjectHelper.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/VCS/ProjectHelper.py Tue Oct 06 17:52:44 2020 +0200 @@ -223,7 +223,7 @@ vcs = self.project.initVCS(selectedVcsSystem) if vcs is not None: vcsdlg = vcs.vcsNewProjectOptionsDialog() - if vcsdlg.exec_() == QDialog.Accepted: + if vcsdlg.exec() == QDialog.Accepted: projectdir, vcsDataDict = vcsdlg.getData() # edit VCS command options if vcs.vcsSupportCommandOptions(): @@ -240,7 +240,7 @@ if vcores: from .CommandOptionsDialog import VcsCommandOptionsDialog codlg = VcsCommandOptionsDialog(vcs) - if codlg.exec_() == QDialog.Accepted: + if codlg.exec() == QDialog.Accepted: vcs.vcsSetOptions(codlg.getOptions()) # create the project directory if it doesn't exist already @@ -314,7 +314,7 @@ PropertiesDialog ) dlg = PropertiesDialog(self.project, False) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.storeData() self.project.initFileTypes() self.project.pdata["VCS"] = selectedVcsSystem @@ -423,7 +423,7 @@ if self.project.vcs is not None: vcsdlg = self.project.vcs.vcsOptionsDialog( self.project, self.project.name, 1) - if vcsdlg.exec_() == QDialog.Accepted: + if vcsdlg.exec() == QDialog.Accepted: vcsDataDict = vcsdlg.getData() # edit VCS command options if self.project.vcs.vcsSupportCommandOptions(): @@ -442,7 +442,7 @@ VcsCommandOptionsDialog ) codlg = VcsCommandOptionsDialog(self.project.vcs) - if codlg.exec_() == QDialog.Accepted: + if codlg.exec() == QDialog.Accepted: self.project.vcs.vcsSetOptions(codlg.getOptions()) self.project.setDirty(True) self.project.vcs.vcsSetDataFromDict(vcsDataDict) @@ -519,7 +519,7 @@ if self.vcs.vcsSupportCommandOptions(): from .CommandOptionsDialog import VcsCommandOptionsDialog codlg = VcsCommandOptionsDialog(self.vcs) - if codlg.exec_() == QDialog.Accepted: + if codlg.exec() == QDialog.Accepted: self.vcs.vcsSetOptions(codlg.getOptions()) self.project.setDirty(True) @@ -604,4 +604,4 @@ from .RepositoryInfoDialog import VcsRepositoryInfoDialog info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() + dlg.exec()
--- a/eric6/ViewManager/ViewManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/ViewManager/ViewManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -308,7 +308,7 @@ if aw is not None: menu = aw.getMenu("Languages") if menu is not None: - menu.exec_(pos) + menu.exec(pos) def __showEolMenu(self, pos): """ @@ -320,7 +320,7 @@ if aw is not None: menu = aw.getMenu("Eol") if menu is not None: - menu.exec_(pos) + menu.exec(pos) def __showEncodingsMenu(self, pos): """ @@ -332,7 +332,7 @@ if aw is not None: menu = aw.getMenu("Encodings") if menu is not None: - menu.exec_(pos) + menu.exec(pos) ########################################################################### ## methods below need to be implemented by a subclass @@ -5386,7 +5386,7 @@ """ from .BookmarkedFilesDialog import BookmarkedFilesDialog dlg = BookmarkedFilesDialog(self.bookmarked, self.ui) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.bookmarked = dlg.getBookmarkedFiles() def __clearBookmarked(self): @@ -5995,7 +5995,7 @@ lines = aw.lines() curLine = aw.getCursorPosition()[0] + 1 dlg = GotoDialog(lines, curLine, self.ui, None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: aw.gotoLine(dlg.getLinenumber(), expand=True) def __gotoBrace(self): @@ -6105,7 +6105,7 @@ if aw: from QScintilla.ZoomDialog import ZoomDialog dlg = ZoomDialog(aw.getZoom(), self.ui, None, True) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: value = dlg.getZoomSize() self.__zoomTo(value) @@ -6614,7 +6614,7 @@ QCoreApplication.translate('ViewManager', "Editing {0}") .format(fileInfo), self.ui) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: data = dlg.getData() try: f = open(dictionaryFile, "w", encoding="utf-8")
--- a/eric6/VirtualEnv/VirtualenvManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/VirtualEnv/VirtualenvManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -174,7 +174,7 @@ ) dlg = VirtualenvConfigurationDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: resultDict = dlg.getData() if resultDict["envType"] == "conda": @@ -193,7 +193,7 @@ dia = VirtualenvExecDialog(resultDict, self) dia.show() dia.start(resultDict["arguments"]) - dia.exec_() + dia.exec() def addVirtualEnv(self, venvName, venvDirectory, venvInterpreter="", isGlobal=False, isConda=False, isRemote=False, @@ -230,7 +230,7 @@ dlg = VirtualenvNameDialog( list(self.__virtualEnvironments.keys()), venvName) - if dlg.exec_() != QDialog.Accepted: + if dlg.exec() != QDialog.Accepted: return venvName = dlg.getName() @@ -240,7 +240,7 @@ VirtualenvInterpreterSelectionDialog ) dlg = VirtualenvInterpreterSelectionDialog(venvName, venvDirectory) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: venvInterpreter = dlg.getData() if venvInterpreter: @@ -372,7 +372,7 @@ """ environments?"""), venvMessages ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for venvName in venvNames: if self.__isEnvironmentDeleteable(venvName): if self.isCondaEnvironment(venvName): @@ -437,7 +437,7 @@ """ environments?"""), venvMessages ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: for venvName in venvNames: if venvName in self.__virtualEnvironments: del self.__virtualEnvironments[venvName] @@ -473,7 +473,7 @@ self, self.__ui) if modal: - self.__virtualenvManagerDialog.exec_() + self.__virtualenvManagerDialog.exec() else: self.__virtualenvManagerDialog.show()
--- a/eric6/VirtualEnv/VirtualenvManagerDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/VirtualEnv/VirtualenvManagerDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -96,7 +96,7 @@ """ from .VirtualenvAddEditDialog import VirtualenvAddEditDialog dlg = VirtualenvAddEditDialog(self.__manager) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (venvName, venvDirectory, venvInterpreter, isGlobal, isConda, isRemote, execPath) = dlg.getData() @@ -128,7 +128,7 @@ selectedItem.data(0, VirtualenvManagerDialog.IsRemoteRole), selectedItem.data(0, VirtualenvManagerDialog.ExecPathRole), ) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: (venvName, venvDirectory, venvInterpreter, isGlobal, isConda, isRemote, execPath) = dlg.getData() if venvName != oldVenvName:
--- a/eric6/WebBrowser/AdBlock/AdBlockIcon.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/AdBlock/AdBlockIcon.py Tue Oct 06 17:52:44 2020 +0200 @@ -130,7 +130,7 @@ """ menu = QMenu() self.__createMenu(menu) - menu.exec_(pos) + menu.exec(pos) def __enableAdBlock(self, act): """
--- a/eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/AdBlock/AdBlockTreeWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -169,7 +169,7 @@ if item.parent() is None: act.setDisabled(True) - menu.exec_(self.viewport().mapToGlobal(pos)) + menu.exec(self.viewport().mapToGlobal(pos)) def __itemChanged(self, itm): """
--- a/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -180,7 +180,7 @@ if idx.isValid() and node.type() == BookmarkNode.Folder: menu.addSeparator() menu.addAction(self.tr("New &Folder..."), self.__newFolder) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def __activated(self, idx): """ @@ -303,7 +303,7 @@ sourceIndex = self.__proxyModel.mapToSource(idx) node = self.__bookmarksModel.node(sourceIndex) dlg = BookmarkPropertiesDialog(node) - dlg.exec_() + dlg.exec() def __newFolder(self): """
--- a/eric6/WebBrowser/Bookmarks/BookmarksManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -380,7 +380,7 @@ """ from .BookmarksImportDialog import BookmarksImportDialog dlg = BookmarksImportDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: importRootNode = dlg.getImportedBookmarks() if importRootNode is not None: self.addBookmark(self.menu(), importRootNode)
--- a/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksMenu.py Tue Oct 06 17:52:44 2020 +0200 @@ -191,7 +191,7 @@ act2.setData(v) act2.triggered.connect(lambda: self.__edit(act2)) - execAct = menu.exec_(QCursor.pos()) + execAct = menu.exec(QCursor.pos()) if execAct is not None: self.close() parent = self.parent() @@ -277,7 +277,7 @@ idx = self.index(act) node = self.model().node(idx) dlg = BookmarkPropertiesDialog(node) - dlg.exec_() + dlg.exec() ##############################################################################
--- a/eric6/WebBrowser/Bookmarks/BookmarksToolBar.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Bookmarks/BookmarksToolBar.py Tue Oct 06 17:52:44 2020 +0200 @@ -115,7 +115,7 @@ menu.addAction(self.tr("Add Bookmark..."), self.__newBookmark) menu.addAction(self.tr("Add Folder..."), self.__newFolder) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def __updateVisitCount(self, idx): """ @@ -231,7 +231,7 @@ from .AddBookmarkDialog import AddBookmarkDialog dlg = AddBookmarkDialog() dlg.setCurrentIndex(self.rootIndex()) - dlg.exec_() + dlg.exec() def __newFolder(self): """ @@ -241,7 +241,7 @@ dlg = AddBookmarkDialog() dlg.setCurrentIndex(self.rootIndex()) dlg.setFolder(True) - dlg.exec_() + dlg.exec() def _createMenu(self): """ @@ -267,4 +267,4 @@ idx = self.index(act) node = self.__bookmarksModel.node(idx) dlg = BookmarkPropertiesDialog(node) - dlg.exec_() + dlg.exec()
--- a/eric6/WebBrowser/CookieJar/CookiesConfigurationDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/CookieJar/CookiesConfigurationDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -85,7 +85,7 @@ """ from .CookiesExceptionsDialog import CookiesExceptionsDialog dlg = CookiesExceptionsDialog(self.__mw.cookieJar()) - dlg.exec_() + dlg.exec() @pyqtSlot() def on_cookiesButton_clicked(self): @@ -94,4 +94,4 @@ """ from .CookiesDialog import CookiesDialog dlg = CookiesDialog(self.__mw.cookieJar()) - dlg.exec_() + dlg.exec()
--- a/eric6/WebBrowser/CookieJar/CookiesDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/CookieJar/CookiesDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -107,7 +107,7 @@ domain = current.text(0) dlg = CookiesExceptionsDialog(self.__cookieJar, self) dlg.setDomainName(domain) - dlg.exec_() + dlg.exec() @pyqtSlot() def on_removeButton_clicked(self):
--- a/eric6/WebBrowser/Download/DownloadItem.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Download/DownloadItem.py Tue Oct 06 17:52:44 2020 +0200 @@ -176,7 +176,7 @@ "{0}://{1}".format(url.scheme(), url.authority()), self) - if dlg.exec_() == QDialog.Rejected or dlg.getAction() == "cancel": + if dlg.exec() == QDialog.Rejected or dlg.getAction() == "cancel": self.progressBar.setVisible(False) self.on_stopButton_clicked() self.filenameLabel.setText(
--- a/eric6/WebBrowser/Download/DownloadManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Download/DownloadManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -137,7 +137,7 @@ self.tr("Remove From List"), self.__contextMenuRemoveSelected) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def shutdown(self): """
--- a/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/FeaturePermissions/FeaturePermissionManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -234,7 +234,7 @@ from .FeaturePermissionsDialog import FeaturePermissionsDialog dlg = FeaturePermissionsDialog(self.__featurePermissions) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: newFeaturePermissions = dlg.getData() self.__featurePermissions = newFeaturePermissions self.__saveSettings()
--- a/eric6/WebBrowser/Feeds/FeedsManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Feeds/FeedsManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -176,7 +176,7 @@ from .FeedEditDialog import FeedEditDialog dlg = FeedEditDialog(origUrlString, origTitle) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: urlString, title = dlg.getData() for feed in self.__feeds: if feed[0] == urlString: @@ -359,14 +359,14 @@ menu.addSeparator() menu.addAction(self.tr("&Copy URL to Clipboard"), self.__copyUrlToClipboard) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) else: errorString = itm.data(0, FeedsManager.ErrorDataRole) if errorString: menu = QMenu() menu.addAction( self.tr("&Show error data"), self.__showError) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def __itemActivated(self, itm, column): """
--- a/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/FlashCookieManager/FlashCookieManagerDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -232,7 +232,7 @@ self.cookiesList.setCurrentItem(itm) - activatedAction = menu.exec_( + activatedAction = menu.exec( self.cookiesList.viewport().mapToGlobal(pos)) if itm.childCount() == 0: origin = itm.data(0, Qt.UserRole).origin
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyConfiguration/GreaseMonkeyConfigurationDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -86,7 +86,7 @@ GreaseMonkeyConfigurationScriptInfoDialog ) infoDlg = GreaseMonkeyConfigurationScriptInfoDialog(script, self) - infoDlg.exec_() + infoDlg.exec() def __loadScripts(self): """
--- a/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/GreaseMonkey/GreaseMonkeyManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -115,7 +115,7 @@ GreaseMonkeyAddScriptDialog ) dlg = GreaseMonkeyAddScriptDialog(self, script) - deleteScript = dlg.exec_() != QDialog.Accepted + deleteScript = dlg.exec() != QDialog.Accepted else: E5MessageBox.information( None,
--- a/eric6/WebBrowser/History/HistoryDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/History/HistoryDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -121,7 +121,7 @@ menu.addSeparator() menu.addAction(self.tr("&Copy"), self.__copyHistory) menu.addAction(self.tr("&Remove"), self.historyTree.removeSelected) - menu.exec_(QCursor.pos()) + menu.exec(QCursor.pos()) def __activated(self, idx): """
--- a/eric6/WebBrowser/Navigation/NavigationBar.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Navigation/NavigationBar.py Tue Oct 06 17:52:44 2020 +0200 @@ -368,4 +368,4 @@ @type QPoint """ menu = self.__mw.createPopupMenu() - menu.exec_(self.mapToGlobal(pos)) + menu.exec(self.mapToGlobal(pos))
--- a/eric6/WebBrowser/Network/NetworkManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Network/NetworkManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -152,7 +152,7 @@ from .SslErrorExceptionsDialog import SslErrorExceptionsDialog dlg = SslErrorExceptionsDialog(self.__permanentlyIgnoredSslErrors) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__permanentlyIgnoredSslErrors = dlg.getSslErrorExceptions() self.changed.emit() @@ -214,7 +214,7 @@ tempButton = msgBox.addButton(self.tr("&Temporary accept"), E5MessageBox.AcceptRole) msgBox.addButton(self.tr("&Reject"), E5MessageBox.RejectRole) - msgBox.exec_() + msgBox.exec() if msgBox.clickedButton() == permButton: if host not in self.__permanentlyIgnoredSslErrors: self.__permanentlyIgnoredSslErrors[host] = [] @@ -302,7 +302,7 @@ ) if username: dlg.setData(username, password) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: username, password = dlg.getData() auth.setUser(username) auth.setPassword(password)
--- a/eric6/WebBrowser/Network/SslErrorExceptionsDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Network/SslErrorExceptionsDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -137,7 +137,7 @@ self.on_removeAllButton_clicked).setEnabled( self.errorsTree.topLevelItemCount() > 0) - menu.exec_(self.errorsTree.mapToGlobal(pos)) + menu.exec(self.errorsTree.mapToGlobal(pos)) @pyqtSlot() def on_errorsTree_itemSelectionChanged(self):
--- a/eric6/WebBrowser/OpenSearch/OpenSearchDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/OpenSearch/OpenSearchDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -106,7 +106,7 @@ engineName = osm.allEnginesNames()[row] engine = osm.engine(engineName) dlg = OpenSearchEditDialog(engine, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: osm.enginesChanged() def __selectionChanged(self, selected, deselected):
--- a/eric6/WebBrowser/Passwords/PasswordManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Passwords/PasswordManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -307,7 +307,7 @@ noButton = mb.addButton( self.tr("Not now"), E5MessageBox.RejectRole) mb.addButton(E5MessageBox.Yes) - mb.exec_() + mb.exec() if mb.clickedButton() == neverButton: self.__never.append(url.toString()) return
--- a/eric6/WebBrowser/PersonalInformationManager/PersonalInformationManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/PersonalInformationManager/PersonalInformationManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -125,7 +125,7 @@ """ from .PersonalDataDialog import PersonalDataDialog dlg = PersonalDataDialog() - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: dlg.storeData() self.__loadSettings()
--- a/eric6/WebBrowser/QtHelp/HelpIndexWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/QtHelp/HelpIndexWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -128,7 +128,7 @@ link = QUrl() from .HelpTopicDialog import HelpTopicDialog dlg = HelpTopicDialog(self, keyword, links) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: link = dlg.link() return link @@ -210,7 +210,7 @@ newWindow = menu.addAction(self.tr("Open Link in New Window")) menu.move(self.__index.mapToGlobal(pos)) - act = menu.exec_() + act = menu.exec() model = self.__index.model() if model is not None: keyword = model.data(idx, Qt.DisplayRole)
--- a/eric6/WebBrowser/QtHelp/HelpSearchWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/QtHelp/HelpSearchWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -149,7 +149,7 @@ self.tr("Open Link in Background Tab")) newWindow = menu.addAction(self.tr("Open Link in New Window")) menu.move(evt.globalPos()) - act = menu.exec_() + act = menu.exec() if act == curTab: self.openUrl.emit(link) elif act == newTab:
--- a/eric6/WebBrowser/QtHelp/HelpTocWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/QtHelp/HelpTocWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -163,7 +163,7 @@ newWindow = menu.addAction(self.tr("Open Link in New Window")) menu.move(self.__tocWidget.mapToGlobal(pos)) - act = menu.exec_() + act = menu.exec() if act == curTab: self.openUrl.emit(link) elif act == newTab:
--- a/eric6/WebBrowser/QtHelp/QtHelpDocumentationDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/QtHelp/QtHelpDocumentationDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -130,7 +130,7 @@ self.__pluginHelpDocuments, QtHelpDocumentationSelectionDialog.AddMode, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: documents = dlg.getData() if not documents: return @@ -149,7 +149,7 @@ self.__pluginHelpDocuments, QtHelpDocumentationSelectionDialog.ManageMode, self) - dlg.exec_() + dlg.exec() def __registerDocumentations(self, fileNames): """
--- a/eric6/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/SafeBrowsing/SafeBrowsingCache.py Tue Oct 06 17:52:44 2020 +0200 @@ -151,21 +151,21 @@ try: query = QSqlQuery(db) # step 1: drop old tables - query.exec_(self.drop_threat_list_stmt) - query.exec_(self.drop_full_hashes_stmt) - query.exec_(self.drop_hash_prefix_stmt) + query.exec(self.drop_threat_list_stmt) + query.exec(self.drop_full_hashes_stmt) + query.exec(self.drop_hash_prefix_stmt) # step 2: drop old indices - query.exec_(self.drop_full_hash_cue_idx) - query.exec_(self.drop_full_hash_expires_idx) - query.exec_(self.drop_full_hash_value_idx) + query.exec(self.drop_full_hash_cue_idx) + query.exec(self.drop_full_hash_expires_idx) + query.exec(self.drop_full_hash_value_idx) # step 3: create tables - query.exec_(self.create_threat_list_stmt) - query.exec_(self.create_full_hashes_stmt) - query.exec_(self.create_hash_prefix_stmt) + query.exec(self.create_threat_list_stmt) + query.exec(self.create_full_hashes_stmt) + query.exec(self.create_hash_prefix_stmt) # step 4: create indices - query.exec_(self.create_full_hash_cue_idx) - query.exec_(self.create_full_hash_expires_idx) - query.exec_(self.create_full_hash_value_idx) + query.exec(self.create_full_hash_cue_idx) + query.exec(self.create_full_hash_expires_idx) + query.exec(self.create_full_hash_value_idx) finally: del query db.commit() @@ -199,7 +199,7 @@ query.addBindValue(QByteArray(hashValue), QSql.In | QSql.Binary) - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M523__ threatType = query.value(0) @@ -244,7 +244,7 @@ for prefix in prefixes: query.addBindValue(prefix) - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M523__ fullHash = bytes(query.value(0)) @@ -305,7 +305,7 @@ query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) query.addBindValue(malwareThreatType) - query.exec_() + query.exec() del query query = QSqlQuery(db) @@ -315,7 +315,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -341,7 +341,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -367,7 +367,7 @@ try: query = QSqlQuery(db) query.prepare(queryStr) - query.exec_() + query.exec() del query finally: db.commit() @@ -405,7 +405,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -430,7 +430,7 @@ query = QSqlQuery(db) query.prepare(queryStr) - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M523__ threatType = query.value(0) @@ -470,7 +470,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -496,7 +496,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -525,7 +525,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query finally: db.commit() @@ -558,7 +558,7 @@ query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() while query.next(): # __IGNORE_WARNING_M523__ sha256Hash.addData(query.value(0)) @@ -601,7 +601,7 @@ query.addBindValue(threatList.threatType) query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() del query QCoreApplication.processEvents(QEventLoop.AllEvents, self.maxProcessEventsTime) @@ -638,7 +638,7 @@ query.addBindValue(threatList.platformType) query.addBindValue(threatList.threatEntryType) - query.exec_() + query.exec() index = 0 while query.next(): # __IGNORE_WARNING_M523__ @@ -694,7 +694,7 @@ for prefix in removeBatch: query.addBindValue(QByteArray(prefix), QSql.In | QSql.Binary) - query.exec_() + query.exec() del query QCoreApplication.processEvents( QEventLoop.AllEvents, self.maxProcessEventsTime)
--- a/eric6/WebBrowser/Session/SessionManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Session/SessionManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -714,7 +714,7 @@ ) combo.setCurrentIndex(0) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: session = combo.currentData() if session is None: self.__lastActiveSession = self.__sessionDefault
--- a/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/SiteInfo/SiteInfoDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -272,7 +272,7 @@ act = menu.addAction(self.tr("Save Image")) act.setData(self.imagesTree.indexOfTopLevelItem(itm)) act.triggered.connect(lambda: self.__saveImage(act)) - menu.exec_(self.imagesTree.viewport().mapToGlobal(pos)) + menu.exec(self.imagesTree.viewport().mapToGlobal(pos)) def __copyAction(self, act): """
--- a/eric6/WebBrowser/StatusBar/ImagesIcon.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/StatusBar/ImagesIcon.py Tue Oct 06 17:52:44 2020 +0200 @@ -81,7 +81,7 @@ act.setChecked(Preferences.getWebBrowser("AutoLoadImages")) act.toggled.connect(self.__setGlobalLoadingImages) - menu.exec_(pos) + menu.exec(pos) @pyqtSlot() def __updateIcon(self):
--- a/eric6/WebBrowser/StatusBar/JavaScriptIcon.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/StatusBar/JavaScriptIcon.py Tue Oct 06 17:52:44 2020 +0200 @@ -86,7 +86,7 @@ menu.addAction(self.tr("Global Settings")).setFont(boldFont) menu.addAction(self.tr("Manage JavaScript Settings"), self.__showJavaScriptSettingsDialog) - menu.exec_(pos) + menu.exec(pos) @pyqtSlot() def __updateIcon(self): @@ -133,7 +133,7 @@ """ from .JavaScriptSettingsDialog import JavaScriptSettingsDialog dlg = JavaScriptSettingsDialog(self._window) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self._window.preferencesChanged() QTimer.singleShot(500, self.__updateIcon)
--- a/eric6/WebBrowser/Sync/SyncManager.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Sync/SyncManager.py Tue Oct 06 17:52:44 2020 +0200 @@ -59,7 +59,7 @@ """ from .SyncAssistantDialog import SyncAssistantDialog dlg = SyncAssistantDialog() - dlg.exec_() + dlg.exec() def loadSettings(self, forceUpload=False): """
--- a/eric6/WebBrowser/TabManager/TabManagerWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/TabManager/TabManagerWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -126,7 +126,7 @@ dlg = AddBookmarkDialog() dlg.setFolder(True) dlg.setTitle(self.tr("Saved Tabs")) - dlg.exec_() + dlg.exec() folder = dlg.addedNode() if folder is None: @@ -537,7 +537,7 @@ act.setObjectName("closeSelection") act.triggered.connect(lambda: self.__processActions(act)) - menu.exec_(self.__tree.viewport().mapToGlobal(pos)) + menu.exec(self.__tree.viewport().mapToGlobal(pos)) def mainWindowCreated(self, mainWin, refresh=True): """
--- a/eric6/WebBrowser/Tools/PrintToPdfDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Tools/PrintToPdfDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -65,7 +65,7 @@ printer.setPageLayout(self.__currentPageLayout) dlg = QPageSetupDialog(printer, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: self.__currentPageLayout = printer.pageLayout() self.__updatePageLayoutLabel()
--- a/eric6/WebBrowser/Tools/WebIconDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Tools/WebIconDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -61,7 +61,7 @@ self.on_removeAllButton_clicked).setEnabled( self.iconsList.count() > 0) - menu.exec_(self.iconsList.mapToGlobal(pos)) + menu.exec(self.iconsList.mapToGlobal(pos)) @pyqtSlot() def on_iconsList_itemSelectionChanged(self):
--- a/eric6/WebBrowser/Tools/WebIconProvider.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/Tools/WebIconProvider.py Tue Oct 06 17:52:44 2020 +0200 @@ -228,7 +228,7 @@ from .WebIconDialog import WebIconDialog dlg = WebIconDialog(self.__iconsDB) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: changed = False urls = dlg.getUrls() for url in list(self.__iconsDB.keys())[:]:
--- a/eric6/WebBrowser/UrlBar/FavIconLabel.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/UrlBar/FavIconLabel.py Tue Oct 06 17:52:44 2020 +0200 @@ -103,7 +103,7 @@ if p: drag.setPixmap(p) drag.setMimeData(mimeData) - drag.exec_() + drag.exec() def __showPopup(self, pos): """
--- a/eric6/WebBrowser/UrlBar/UrlBar.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/UrlBar/UrlBar.py Tue Oct 06 17:52:44 2020 +0200 @@ -191,7 +191,7 @@ ) url = self.__browser.url() dlg = BookmarkActionSelectionDialog(url) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: action = dlg.getAction() if action == BookmarkActionSelectionDialog.AddBookmark: self.__browser.addBookmark() @@ -201,7 +201,7 @@ ) from .BookmarkInfoDialog import BookmarkInfoDialog dlg = BookmarkInfoDialog(bookmark, self.__browser) - dlg.exec_() + dlg.exec() elif action == BookmarkActionSelectionDialog.AddSpeeddial: self.__mw.speedDial().addPage( url, self.__browser.title()) @@ -400,7 +400,7 @@ from WebBrowser.Feeds.FeedsDialog import FeedsDialog feeds = self.__browser.getRSS() dlg = FeedsDialog(feeds, self.__browser) - dlg.exec_() + dlg.exec() @pyqtSlot(QPoint) def __showThreatInfo(self, pos):
--- a/eric6/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/VirusTotal/VirusTotalDomainReportDialog.py Tue Oct 06 17:52:44 2020 +0200 @@ -99,4 +99,4 @@ """ from .VirusTotalWhoisDialog import VirusTotalWhoisDialog dlg = VirusTotalWhoisDialog(self.__whoisDomain, self.__whois) - dlg.exec_() + dlg.exec()
--- a/eric6/WebBrowser/WebBrowserPage.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserPage.py Tue Oct 06 17:52:44 2020 +0200 @@ -306,7 +306,7 @@ self.runJavaScript(script, worldId, resultCallback) - loop.exec_() + loop.exec() return resultDict["res"] def runJavaScript(self, script, worldId=-1, callback=None): @@ -467,7 +467,7 @@ self.print(printer, printCallback) - loop.exec_() + loop.exec() return resultDict["res"] def __contentsSizeChanged(self, size):
--- a/eric6/WebBrowser/WebBrowserTabWidget.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserTabWidget.py Tue Oct 06 17:52:44 2020 +0200 @@ -674,7 +674,7 @@ if isCupsAvailable(): printDialog.setOption(QAbstractPrintDialog.PrintCollateCopies) printDialog.setOption(QAbstractPrintDialog.PrintPageRange) - if printDialog.exec_() == QDialog.Accepted: + if printDialog.exec() == QDialog.Accepted: browser.page().execPrintPage(printer, 10 * 1000) @pyqtSlot() @@ -696,7 +696,7 @@ if not name: name = "printout.pdf" dlg = PrintToPdfDialog(name, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: filePath, pageLayout = dlg.getData() if filePath: if os.path.exists(filePath): @@ -730,7 +730,7 @@ printer.setResolution(Preferences.getPrinter("Resolution")) printDialog = QPrintDialog(printer, self) - if printDialog.exec_() == QDialog.Accepted: + if printDialog.exec() == QDialog.Accepted: browser.render(printer) def __pdfGeneratedForSave(self, filePath, pdfData): @@ -796,7 +796,7 @@ preview.resize(800, 750) preview.paintRequested.connect( lambda p: self.__printPreviewRequested(p, browser)) - preview.exec_() + preview.exec() def __printPreviewRequested(self, printer, browser): """ @@ -974,7 +974,7 @@ self.tr("C&lose Current Tab"), E5MessageBox.AcceptRole) closeTabButton.setIcon(UI.PixmapCache.getIcon("tabClose")) mb.addButton(E5MessageBox.Cancel) - mb.exec_() + mb.exec() if mb.clickedButton() == quitButton: return True else:
--- a/eric6/WebBrowser/WebBrowserView.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserView.py Tue Oct 06 17:52:44 2020 +0200 @@ -1150,7 +1150,7 @@ from .Bookmarks.AddBookmarkDialog import AddBookmarkDialog dlg = AddBookmarkDialog() dlg.setUrl(bytes(url.toEncoded()).decode()) - dlg.exec_() + dlg.exec() def __sendLink(self, act): """ @@ -1346,7 +1346,7 @@ dlg.setUrl(bytes(self.url().toEncoded()).decode()) dlg.setTitle(self.title()) dlg.setDescription(description) - dlg.exec_() + dlg.exec() def dragEnterEvent(self, evt): """ @@ -2328,7 +2328,7 @@ E5SslCertificateSelectionDialog ) dlg = E5SslCertificateSelectionDialog(certificates, self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: certificate = dlg.getSelectedCertificate() if certificate is None:
--- a/eric6/WebBrowser/WebBrowserWindow.py Mon Oct 05 19:51:55 2020 +0200 +++ b/eric6/WebBrowser/WebBrowserWindow.py Tue Oct 06 17:52:44 2020 +0200 @@ -2690,7 +2690,7 @@ menu = self.bookmarksManager().menu() idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu) dlg.setCurrentIndex(idx) - dlg.exec_() + dlg.exec() def __addBookmarkFolder(self): """ @@ -2702,7 +2702,7 @@ idx = self.bookmarksManager().bookmarksModel().nodeIndex(menu) dlg.setCurrentIndex(idx) dlg.setFolder(True) - dlg.exec_() + dlg.exec() def __showBookmarksDialog(self): """ @@ -2726,7 +2726,7 @@ dlg = AddBookmarkDialog() dlg.setFolder(True) dlg.setTitle(self.tr("Saved Tabs")) - dlg.exec_() + dlg.exec() folder = dlg.addedNode() if folder is None: @@ -2916,7 +2916,7 @@ self.tr("&Quit"), E5MessageBox.AcceptRole) quitButton.setIcon(UI.PixmapCache.getIcon("exit")) mb.addButton(E5MessageBox.Cancel) - mb.exec_() + mb.exec() return mb.clickedButton() == quitButton return True @@ -3231,7 +3231,7 @@ dlg.showConfigurationPageByName(self.__lastConfigurationPageName) else: dlg.showConfigurationPageByName("empty") - dlg.exec_() + dlg.exec() QApplication.processEvents() if dlg.result() == QDialog.Accepted: dlg.setPreferences() @@ -3319,7 +3319,7 @@ """ from .WebBrowserLanguagesDialog import WebBrowserLanguagesDialog dlg = WebBrowserLanguagesDialog(self) - dlg.exec_() + dlg.exec() self.networkManager().languagesChanged() def __showCookiesConfiguration(self): @@ -3330,7 +3330,7 @@ CookiesConfigurationDialog ) dlg = CookiesConfigurationDialog(self) - dlg.exec_() + dlg.exec() def __showFlashCookiesManagement(self): """ @@ -3526,7 +3526,7 @@ QtHelpDocumentationDialog ) dlg = QtHelpDocumentationDialog(self.__helpEngine, self) - dlg.exec_() + dlg.exec() if dlg.hasDocumentationChanges(): for i in sorted(dlg.getTabsToClose(), reverse=True): self.__tabWidget.closeBrowserAt(i) @@ -3693,7 +3693,7 @@ WebBrowserClearPrivateDataDialog ) dlg = WebBrowserClearPrivateDataDialog(self) - if dlg.exec_() == QDialog.Accepted: + if dlg.exec() == QDialog.Accepted: # browsing history, search history, favicons, disk cache, cookies, # passwords, web databases, downloads, Flash cookies (history, searches, favicons, cache, cookies, @@ -3736,7 +3736,7 @@ from .OpenSearch.OpenSearchDialog import OpenSearchDialog dlg = OpenSearchDialog(self) - dlg.exec_() + dlg.exec() def searchEnginesAction(self): """ @@ -3754,7 +3754,7 @@ from .Passwords.PasswordsDialog import PasswordsDialog dlg = PasswordsDialog(self) - dlg.exec_() + dlg.exec() def __showCertificateErrorsDialog(self): """ @@ -3793,7 +3793,7 @@ from .ZoomManager.ZoomValuesDialog import ZoomValuesDialog dlg = ZoomValuesDialog(self) - dlg.exec_() + dlg.exec() def __showDownloadsWindow(self): """ @@ -4509,7 +4509,7 @@ from .UserAgent.UserAgentsDialog import UserAgentsDialog dlg = UserAgentsDialog(self) - dlg.exec_() + dlg.exec() @classmethod def syncManager(cls):
