eric: comparison eric6/Project/Project.py

-:27f636beebad
+:2c730d5fd177
 with E5OverrideCursor():
 res = self.__projectFile.readFile(fn)
 else:
 # old XML based format
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.ProjectReader import ProjectReader
 reader = ProjectReader(f, self)
 reader.readXML()
 res = not reader.hasError()
 f.close()
 # create hash value, if it doesn't have one
 if reader.version.startswith("5.") and not self.pdata["HASH"]:
 hashStr = str(QCryptographicHash.hash(
 QByteArray(self.ppath.encode("utf-8")),
-QCryptographicHash.Sha1).toHex(),
+QCryptographicHash.Algorithm.Sha1).toHex(),
 encoding="utf-8")
 self.pdata["HASH"] = hashStr
 self.setDirty(True)
 else:
 E5MessageBox.critical(
 self.vcs.vcsGetOtherData())
 if not self.pdata["HASH"]:
 hashStr = str(QCryptographicHash.hash(
 QByteArray(self.ppath.encode("utf-8")),
-QCryptographicHash.Sha1).toHex(),
+QCryptographicHash.Algorithm.Sha1).toHex(),
 encoding="utf-8")
 self.pdata["HASH"] = hashStr
 if fn is None:
 fn = self.pfile
 with E5OverrideCursor():
 res = self.__projectFile.writeFile(fn)
 else:
 # old XML based format
 f = QFile(fn)
-if f.open(QIODevice.WriteOnly):
+if f.open(QIODevice.OpenModeFlag.WriteOnly):
 from E5XML.ProjectWriter import ProjectWriter
 ProjectWriter(f, os.path.splitext(
 os.path.basename(fn))[0]).writeXML()
 res = True
 else:
 # try the old XML based format second
 fn = os.path.join(self.getProjectManagementDir(),
 '{0}.e4q'.format(fn1))
 if os.path.exists(fn):
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.UserProjectReader import UserProjectReader
 reader = UserProjectReader(f, self)
 reader.readXML()
 f.close()
 else:
 # try the old XML based format second
 fn = os.path.join(self.getProjectManagementDir(),
 '{0}{1}.e5s'.format(fn1, indicator))
 if os.path.exists(fn):
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.SessionReader import SessionReader
 reader = SessionReader(f, False)
 reader.readXML(quiet=quiet)
 f.close()
 else:
 # try old style XML file second
 fn = os.path.join(self.getProjectManagementDir(),
 '{0}.e6t'.format(base))
 if os.path.exists(fn):
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.TasksReader import TasksReader
 reader = TasksReader(f, True)
 reader.readXML()
 f.close()
 else:
 # try the old XML based format second
 fn = os.path.join(self.getProjectManagementDir(),
 '{0}.e4d'.format(fn1))
 f = QFile(fn)
-if f.open(QIODevice.ReadOnly):
+if f.open(QIODevice.OpenModeFlag.ReadOnly):
 from E5XML.DebuggerPropertiesReader import (
 DebuggerPropertiesReader
 )
 reader = DebuggerPropertiesReader(f, self)
 reader.readXML(quiet=quiet)
 """
 Private slot to display the debugger properties dialog.
 """
 from .DebuggerPropertiesDialog import DebuggerPropertiesDialog
 dlg = DebuggerPropertiesDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.storeData()
 def getDebugProperty(self, key):
 """
 Public method to retrieve a debugger property.
 "You have to specify a translation pattern first."))
 return
 from .AddLanguageDialog import AddLanguageDialog
 dlg = AddLanguageDialog(self.parent())
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 lang = dlg.getSelectedLanguage()
 if self.pdata["PROJECTTYPE"] in [
 "PyQt5", "PyQt5C", "PyQt6", "PyQt6C", "E6Plugin",
 "PySide2", "PySide2C", "PySide6", "PySide6C"
 ]:
 if startdir is None:
 startdir = self.ppath
 from .AddFileDialog import AddFileDialog
 dlg = AddFileDialog(self, self.parent(), fileTypeFilter,
 startdir=startdir)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 fnames, target, isSource = dlg.getData()
 if target != '':
 for fn in fnames:
 targetfile = os.path.join(target, os.path.basename(fn))
 if not Utilities.samepath(os.path.dirname(fn), target):
 if startdir is None:
 startdir = self.ppath
 from .AddDirectoryDialog import AddDirectoryDialog
 dlg = AddDirectoryDialog(
 self, fileTypeFilter, self.parent(), startdir=startdir)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 filetype, source, target, recursive = dlg.getData()
 if target == '':
 E5MessageBox.critical(
 self.ui,
 self.tr("Add directory"),
 if not self.checkDirty():
 return
 from .PropertiesDialog import PropertiesDialog
 dlg = PropertiesDialog(self, True)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 self.closeProject()
 dlg.storeData()
 self.pdata["VCS"] = 'None'
 self.opened = True
 if not self.pdata["FILETYPES"]:
 self.projectAboutToBeCreated.emit()
 hashStr = str(QCryptographicHash.hash(
 QByteArray(self.ppath.encode("utf-8")),
-QCryptographicHash.Sha1).toHex(),
+QCryptographicHash.Algorithm.Sha1).toHex(),
 encoding="utf-8")
 self.pdata["HASH"] = hashStr
 if self.pdata["PROGLANGUAGE"] == "MicroPython":
 # change the lexer association for *.py files
 if vcores:
 from VCS.CommandOptionsDialog import (
 VcsCommandOptionsDialog
 )
 codlg = VcsCommandOptionsDialog(self.vcs)
-if codlg.exec() == QDialog.Accepted:
+if codlg.exec() == QDialog.DialogCode.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # add project file to repository
 if res == 0:
 apres = E5MessageBox.yesNo(
 self.ui,
 else:
 self.pdata["VCS"] = 'None'
 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.DialogCode.Accepted:
 vcsDataDict = vcsdlg.getData()
 else:
 self.pdata["VCS"] = 'None'
 self.vcs = self.initVCS()
 self.setDirty(True)
 if vcores:
 from VCS.CommandOptionsDialog import (
 VcsCommandOptionsDialog
 )
 codlg = VcsCommandOptionsDialog(self.vcs)
-if codlg.exec() == QDialog.Accepted:
+if codlg.exec() == QDialog.DialogCode.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # create the project in the VCS
 self.vcs.vcsSetDataFromDict(vcsDataDict)
 self.saveProject()
 self.tr("Translation Pattern"),
 self.tr(
 "Enter the path pattern for translation files "
 "(use '%language%' in place of the language"
 " code):"),
-QLineEdit.Normal,
+QLineEdit.EchoMode.Normal,
 tslist[0])
 if pattern:
 self.pdata["TRANSLATIONPATTERN"] = pattern
 if self.pdata["TRANSLATIONPATTERN"]:
 self.pdata["TRANSLATIONPATTERN"] = self.getRelativePath(
 """
 Private slot to display the properties dialog.
 """
 from .PropertiesDialog import PropertiesDialog
 dlg = PropertiesDialog(self, False)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 projectType = self.pdata["PROJECTTYPE"]
 dlg.storeData()
 self.setDirty(True)
 if self.pdata["MAINSCRIPT"]:
 if not os.path.isabs(self.pdata["MAINSCRIPT"]):
 vcsSystem = self.pdata["VCS"] or None
 vcsSystemOverride = self.pudata["VCSOVERRIDE"] or None
 from .UserPropertiesDialog import UserPropertiesDialog
 dlg = UserPropertiesDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.storeData()
 if (
 (self.pdata["VCS"] and
 self.pdata["VCS"] != vcsSystem) or
 """
 Private slot to display the filetype association dialog.
 """
 from .FiletypeAssociationDialog import FiletypeAssociationDialog
 dlg = FiletypeAssociationDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.transferData()
 self.setDirty(True)
 self.__reorganizeFiles()
 def getFiletypeAssociations(self, associationType):
 """
 Private slot to display the lexer association dialog.
 """
 from .LexerAssociationDialog import LexerAssociationDialog
 dlg = LexerAssociationDialog(self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 dlg.transferData()
 self.setDirty(True)
 self.lexerAssociationsChanged.emit()
 def getEditorLexerAssoc(self, filename):
 """
 if self.pdata["EOL"] >= 0:
 return self.eols[self.pdata["EOL"]]
 else:
 eolMode = Preferences.getEditor("EOLMode")
-if eolMode == QsciScintilla.EolWindows:
+if eolMode == QsciScintilla.EolMode.EolWindows:
 eol = '\r\n'
-elif eolMode == QsciScintilla.EolUnix:
+elif eolMode == QsciScintilla.EolMode.EolUnix:
 eol = '\n'
-elif eolMode == QsciScintilla.EolMac:
+elif eolMode == QsciScintilla.EolMode.EolMac:
 eol = '\r'
 else:
 eol = os.linesep
 return eol
 elif len(pkglists) > 1:
 dlg = E5ListSelectionDialog(
 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.DialogCode.Accepted:
 selectedLists = [os.path.join(self.ppath, s)
 for s in dlg.getSelection()]
 else:
 return
 @type bool
 @param interactive flag indicating an interactive invocation (i.e.
 through a menu action)
 @type bool
 """
-if exitStatus == QProcess.CrashExit:
+if exitStatus == QProcess.ExitStatus.CrashExit:
 E5MessageBox.critical(
 self.ui,
 self.tr("Execute Make"),
 self.tr("""The make process crashed."""))
 else:

Mercurial Repositories > eric / file comparison

comparison: eric6/Project/Project.py

eric6/Project/Project.py