Flask Project: comparison ProjectFlask/Project.py

-:7c05cbc8b3e5
+:0ee58185b8df
 Module implementing the Flask project support.
 """
 import os
-from PyQt5.QtCore import (
+from PyQt6.QtCore import (
 pyqtSlot, QObject, QProcess, QProcessEnvironment, QTimer, QFileInfo
 )
-from PyQt5.QtWidgets import QMenu, QDialog
+from PyQt6.QtWidgets import QMenu, QDialog
-from E5Gui import E5MessageBox, E5FileDialog
+from EricWidgets import EricMessageBox, EricFileDialog
-from E5Gui.E5Action import E5Action
+from EricGui.EricAction import EricAction
-from E5Gui.E5Application import e5App
+from EricWidgets.EricApplication import ericApp
 from Globals import isWindowsPlatform
 import UI.PixmapCache
 import Utilities
 self.__plugin = plugin
 self.__iconSuffix = iconSuffix
 self.__ui = parent
-self.__e5project = e5App().getObject("Project")
+self.__ericProject = ericApp().getObject("Project")
-self.__virtualEnvManager = e5App().getObject("VirtualEnvManager")
+self.__virtualEnvManager = ericApp().getObject("VirtualEnvManager")
 self.__menus = {}   # dictionary with references to menus
 self.__formsBrowser = None
 self.__hooksInstalled = False
 ##############################
 ## run actions below        ##
 ##############################
-self.runServerAct = E5Action(
+self.runServerAct = EricAction(
 self.tr('Run Server'),
 self.tr('Run &Server'),
 0, 0,
 self, 'flask_run_server')
 self.runServerAct.setStatusTip(self.tr(
 """<p>Starts the Flask Web server.</p>"""
 ))
 self.runServerAct.triggered.connect(self.__runServer)
 self.actions.append(self.runServerAct)
-self.runDevServerAct = E5Action(
+self.runDevServerAct = EricAction(
 self.tr('Run Development Server'),
 self.tr('Run &Development Server'),
 0, 0,
 self, 'flask_run_dev_server')
 self.runDevServerAct.setStatusTip(self.tr(
 """<p>Starts the Flask Web server in development mode.</p>"""
 ))
 self.runDevServerAct.triggered.connect(self.__runDevelopmentServer)
 self.actions.append(self.runDevServerAct)
-self.askForServerOptionsAct = E5Action(
+self.askForServerOptionsAct = EricAction(
 self.tr('Ask for Server Start Options'),
 self.tr('Ask for Server Start Options'),
 0, 0,
 self, 'flask_ask_server_options')
 self.askForServerOptionsAct.setStatusTip(self.tr(
 ###############################
 ## shell action below        ##
 ###############################
-self.runPythonShellAct = E5Action(
+self.runPythonShellAct = EricAction(
 self.tr('Start Flask Python Console'),
 self.tr('Start Flask &Python Console'),
 0, 0,
 self, 'flask_python_console')
 self.runPythonShellAct.setStatusTip(self.tr(
 ################################
 ## routes action below        ##
 ################################
-self.showRoutesAct = E5Action(
+self.showRoutesAct = EricAction(
 self.tr('Show Routes'),
 self.tr('Show &Routes'),
 0, 0,
 self, 'flask_show_routes')
 self.showRoutesAct.setStatusTip(self.tr(
 ##################################
 ## documentation action below   ##
 ##################################
-self.documentationAct = E5Action(
+self.documentationAct = EricAction(
 self.tr('Documentation'),
 self.tr('D&ocumentation'),
 0, 0,
 self, 'flask_documentation')
 self.documentationAct.setStatusTip(self.tr(
 ##############################
 ## about action below       ##
 ##############################
-self.aboutFlaskAct = E5Action(
+self.aboutFlaskAct = EricAction(
 self.tr('About Flask'),
 self.tr('About &Flask'),
 0, 0,
 self, 'flask_about')
 self.aboutFlaskAct.setStatusTip(self.tr(
 ######################################
 ## configuration action below       ##
 ######################################
-self.flaskConfigAct = E5Action(
+self.flaskConfigAct = EricAction(
 self.tr('Configure Flask for Project'),
 self.tr('Configure Flask for &Project'),
 0, 0,
 self, 'flask_config_for_project')
 self.flaskConfigAct.setStatusTip(self.tr(
 def projectOpenedHooks(self):
 """
 Public method to add our hook methods.
 """
-if self.__e5project.getProjectType() == "Flask":
+if self.__ericProject.getProjectType() == "Flask":
 self.__formsBrowser = (
-e5App().getObject("ProjectBrowser")
+ericApp().getObject("ProjectBrowser")
 .getProjectBrowser("forms"))
 self.__formsBrowser.addHookMethodAndMenuEntry(
 "newForm", self.newForm, self.tr("New template..."))
 self.__determineCapabilities()
 @type str
 """
 from .FormSelectionDialog import FormSelectionDialog
 dlg = FormSelectionDialog()
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 template = dlg.getTemplateText()
 fileFilters = self.tr(
 "HTML Files (*.html);;"
 "HTML Files (*.htm);;"
 "All Files (*)")
-fname, selectedFilter = E5FileDialog.getSaveFileNameAndFilter(
+fname, selectedFilter = EricFileDialog.getSaveFileNameAndFilter(
 self.__ui,
 self.tr("New Form"),
 dirPath,
 fileFilters,
 None,
-E5FileDialog.Options(E5FileDialog.DontConfirmOverwrite))
+EricFileDialog.Options(EricFileDialog.DontConfirmOverwrite))
 if fname:
 ext = QFileInfo(fname).suffix()
 if not ext:
 ex = selectedFilter.split("(*")[1].split(")")[0]
 if ex:
 fname += ex
 if os.path.exists(fname):
-res = E5MessageBox.yesNo(
+res = EricMessageBox.yesNo(
 self.__ui,
 self.tr("New Form"),
 self.tr("""The file already exists! Overwrite"""
 """ it?"""),
-icon=E5MessageBox.Warning)
+icon=EricMessageBox.Warning)
 if not res:
 # user selected to not overwrite
 return
 try:
 with open(fname, "w", encoding="utf-8") as f:
 f.write(template)
 except OSError as err:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("New Form"),
 self.tr("<p>The new form file <b>{0}</b> could"
 " not be created.</p><p>Problem: {1}</p>")
 .format(fname, str(err)))
 return
-self.__e5project.appendFile(fname)
+self.__ericProject.appendFile(fname)
 self.__formsBrowser.sourceFile.emit(fname)
 ##################################################################
 ## methods below implement virtual environment handling
 ##################################################################
 Public method to get the path of the virtual environment.
 @return path of the virtual environment
 @rtype str
 """
-language = self.__e5project.getProjectLanguage()
+language = self.__ericProject.getProjectLanguage()
 if language == "Python3":
 # get project specific virtual environment name
 venvName = self.getData("flask", "virtual_environment_name")
 if not venvName:
 venvName = self.__plugin.getPreferences(
 Private slot to show some info about Flask.
 """
 versions = self.getFlaskVersionStrings()
 url = "https://palletsprojects.com/p/flask/"
-msgBox = E5MessageBox.E5MessageBox(
+msgBox = EricMessageBox.EricMessageBox(
-E5MessageBox.Question,
+EricMessageBox.Question,
 self.tr("About Flask"),
 self.tr(
 "<p>Flask is a lightweight WSGI web application framework."
 " It is designed to make getting started quick and easy,"
 " with the ability to scale up to complex applications.</p>"
 "</table></p>",
 "Do not translate the program names."
 ).format(versions["flask"], versions["werkzeug"],
 versions["python"], url),
 modal=True,
-buttons=E5MessageBox.Ok)
+buttons=EricMessageBox.Ok)
 msgBox.setIconPixmap(UI.PixmapCache.getPixmap(
 os.path.join("ProjectFlask", "icons",
 "flask64-{0}".format(self.__iconSuffix))))
 msgBox.exec()
 working directory.
 @return tuple containing the working directory and the application name
 @rtype tuple of (str, str)
 """
-mainScript = self.__e5project.getMainScript(normalized=True)
+mainScript = self.__ericProject.getMainScript(normalized=True)
 if not mainScript:
-E5MessageBox.critical(
+EricMessageBox.critical(
 self.__ui,
 self.tr("Prepare Environment"),
 self.tr("""The project has no configured main script"""
 """ (= Flask application). Aborting..."""))
 return "", None
 """
 if category not in self.__projectData:
 self.__projectData[category] = {}
 if not self.__projectData[category]:
-data = self.__e5project.getData(
+data = self.__ericProject.getData(
 "PROJECTTYPESPECIFICDATA", category)
 if data is not None:
 self.__projectData[category] = data
 data = self.__projectData[category]
 """
 if category not in self.__projectData:
 self.__projectData[category] = {}
 if not self.__projectData[category]:
-data = self.__e5project.getData(
+data = self.__ericProject.getData(
 "PROJECTTYPESPECIFICDATA", category)
 if data is not None:
 self.__projectData[category] = data
 if not key:
 self.__projectData[category] = value
 else:
 # update individual entry
 self.__projectData[category][key] = value
-self.__e5project.setData(
+self.__ericProject.setData(
 "PROJECTTYPESPECIFICDATA", category, self.__projectData[category])
 def __determineCapabilities(self):
 """
 Private method to determine capabilities provided by supported
 @type bool
 """
 self.__capabilities[key] = available
 ##################################################################
-## slot below implements project specific flask configuration
+## slots below implements project specific flask configuration
 ##################################################################
 @pyqtSlot()
 def __configureFlaskForProject(self):
 """
 """
 from .FlaskConfigDialog import FlaskConfigDialog
 config = self.getData("flask", "")
 dlg = FlaskConfigDialog(config, self)
-if dlg.exec() == QDialog.Accepted:
+if dlg.exec() == QDialog.DialogCode.Accepted:
 config = dlg.getConfiguration()
 self.setData("flask", "", config)
 self.__setIgnoreVirtualEnvironment()
 self.__setDebugEnvironment()
 to the list of ignore files/directories.
 """
 virtenvName = self.getData("flask", "virtual_environment_name")
 if virtenvName:
 virtenvPath = self.getVirtualEnvironment()
-if self.__e5project.startswithProjectPath(virtenvPath):
+if self.__ericProject.startswithProjectPath(virtenvPath):
-relVirtenvPath = self.__e5project.getRelativeUniversalPath(
+relVirtenvPath = self.__ericProject.getRelativeUniversalPath(
 virtenvPath)
-if relVirtenvPath not in self.__e5project.pdata["FILETYPES"]:
+if relVirtenvPath not in self.__ericProject.pdata["FILETYPES"]:
-self.__e5project.pdata["FILETYPES"][relVirtenvPath] = (
+self.__ericProject.pdata["FILETYPES"][relVirtenvPath] = (
 "__IGNORE__"
 )
-self.__e5project.setDirty(True)
+self.__ericProject.setDirty(True)
 def __setDebugEnvironment(self):
 """
 Private method to set the virtual environment as the selected debug
 environment.
 """
-language = self.__e5project.getProjectLanguage()
+language = self.__ericProject.getProjectLanguage()
 if language == "Python3":
 # get project specific virtual environment name
 venvName = self.getData("flask", "virtual_environment_name")
 if not venvName:
 venvName = self.__plugin.getPreferences(
 "VirtualEnvironmentNamePy3")
 if venvName:
-self.__e5project.debugProperties["VIRTUALENV"] = venvName
+self.__ericProject.debugProperties["VIRTUALENV"] = venvName
 ##################################################################
 ## slot below implements documentation function
 ##################################################################
 """
 Private method to terminate the current Python console.
 """
 if (
 self.__shellProcess is not None and
-self.__shellProcess.state() != QProcess.NotRunning
+self.__shellProcess.state() != QProcess.ProcessState.NotRunning
 ):
 self.__shellProcess.terminate()
 QTimer.singleShot(2000, self.__shellProcess.kill)
 self.__shellProcess.waitForFinished(3000)

Mercurial Repositories > Flask Project / file comparison

comparison: ProjectFlask/Project.py

ProjectFlask/Project.py