Pyramid Project: comparison ProjectPyramid/Project.py

-:1da97e3b7acb
+:a891fb543d28
 @param path full directory path for the new form file (string)
 """
 from .FormSelectionDialog import FormSelectionDialog
 dlg = FormSelectionDialog()
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 template = dlg.getTemplateText()
 fileFilters = self.tr(
 "Chameleon Templates (*.pt);;"
 "Chameleon Text Templates (*.txt);;"
 if not res:
 # user selected to not overwrite
 return
 try:
-f = open(fname, "w", encoding="utf-8")
+with open(fname, "w", encoding="utf-8") as f:
 f.write(template)
-f.close()
 except IOError as e:
 E5MessageBox.critical(
 self.__ui,
 self.tr("New Form"),
 self.tr("<p>The new form file <b>{0}</b> could"
 fullCmds = Utilities.getExecutablePaths(cmd)
 except AttributeError:
 fullCmds = self.__getExecutablePaths(cmd)
 for fullCmd in fullCmds:
 try:
-f = open(fullCmd, 'r', encoding='utf-8')
+with open(fullCmd, 'r', encoding='utf-8') as f:
 l0 = f.readline()
-f.close()
 except (IOError, OSError):
 l0 = ""
 if self.__isSuitableForVariant(variant, l0):
 variants.append(variant)
 break
 buttons=E5MessageBox.Ok)
 msgBox.setIconPixmap(UI.PixmapCache.getPixmap(
 os.path.join("ProjectPyramid", "icons",
 "pyramid64-{0}".format(self.__iconSuffix))
 ))
-msgBox.exec_()
+msgBox.exec()
 def getPyramidVersionString(self):
 """
 Public method to get the Pyramid version as a string.
 if not self.__pyramidVersion:
 cmd = self.getPyramidCommand("pcreate")
 if isWindowsPlatform():
 cmd = os.path.join(os.path.dirname(cmd), "pcreate-script.py")
 try:
-f = open(cmd, 'r', encoding="utf-8")
+with open(cmd, 'r', encoding="utf-8") as f:
 lines = f.read().splitlines()
-f.close()
 for line in lines:
 if line.startswith("__requires__"):
 ## sample: __requires__ = 'pyramid==1.4'
 vers = line.strip().split()[-1][1:-1].split("==")[1]
 self.__pyramidVersion = vers
 Private slot to create a new Pyramid project.
 """
 from .CreateParametersDialog import CreateParametersDialog
 dlg = CreateParametersDialog(self)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 scaffold, project, overwrite, simulate = dlg.getData()
 cmd = self.getPyramidCommand("pcreate")
 args = []
 if overwrite:
 args.append("--scaffold={0}".format(scaffold))
 args.append(project)
 dlg = PyramidDialog(self.tr("Create Pyramid Project"),
 linewrap=False, parent=self.__ui)
 if dlg.startProcess(cmd, args, self.__e5project.getProjectPath()):
-dlg.exec_()
+dlg.exec()
 if dlg.normalExit() and not simulate:
 # search for files created by pcreate and add them to the
 # project
 projectPath = os.path.join(
 self.__e5project.getProjectPath(), project)
 title,
 msgSuccess=self.tr("Pyramid development environment setup"
 " successfully."))
 res = dia.startProcess(cmd, args, wd)
 if res:
-dia.exec_()
+dia.exec()
 initCmd = self.__getInitDbCommand()
 self.initializeDbAct.setEnabled(os.path.exists(initCmd))
 ##################################################################
 ## slots below implement distribution functions
 from .DistributionTypeSelectionDialog import (
 DistributionTypeSelectionDialog
 )
 dlg = DistributionTypeSelectionDialog(self, projectPath, self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 formats = dlg.getFormats()
 cmd = self.getPythonCommand()
 args = []
 args.append("setup.py")
 args.append("sdist")
 title,
 msgSuccess=self.tr("Python distribution file built"
 " successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement database functions
 ##################################################################
 dia = PyramidDialog(
 title,
 msgSuccess=self.tr("Database initialized successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement various debugging functions
 ##################################################################
 args.append(url)
 dia = PyramidDialog(title, fixed=True, linewrap=False)
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 def __showRoutes(self):
 """
 Private slot showing all URL dispatch routes.
 """
 from .PyramidRoutesDialog import PyramidRoutesDialog
 dia = PyramidRoutesDialog(self)
 res = dia.start(projectPath)
 if res:
-dia.exec_()
+dia.exec()
 def __showTweens(self):
 """
 Private slot showing all implicit and explicit tween objects.
 """
 args.append("development.ini")
 dia = PyramidDialog(title, fixed=True, linewrap=False)
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement documentation functions
 ##################################################################
 dia = PyramidDialog(
 title,
 msgSuccess=self.tr("\nMessages extracted successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 self.__e5project.appendFile(os.path.join(projectPath, potFile))
 def __projectLanguageAdded(self, code):
 """
 Private slot handling the addition of a new language.
 title,
 msgSuccess=self.tr("\nMessage catalog initialized"
 " successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 langFile = self.__e5project.getTranslationPattern().replace(
 "%language%", code)
 self.__e5project.appendFile(langFile)
 title,
 msgSuccess=self.tr("\nMessage catalogs compiled"
 " successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 for entry in os.walk(projectPath):
 for fileName in entry[2]:
 fullName = os.path.join(entry[0], fileName)
 if fullName.endswith('.mo'):
 title,
 msgSuccess=self.tr("\nMessage catalogs compiled"
 " successfully."))
 res = dia.startBatchProcesses(argsLists, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 for entry in os.walk(self.__sitePath()):
 for fileName in entry[2]:
 fullName = os.path.join(entry[0], fileName)
 if fullName.endswith('.mo'):
 dia = PyramidDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startProcess(cmd, args, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 def updateSelectedCatalogs(self, filenames):
 """
 Public method to update the message catalogs.
 dia = PyramidDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startBatchProcesses(argsLists, projectPath)
 if res:
-dia.exec_()
+dia.exec()
 def openPOEditor(self, poFile):
 """
 Public method to edit the given file in an external .po editor.

Mercurial Repositories > Pyramid Project / file comparison

comparison: ProjectPyramid/Project.py

ProjectPyramid/Project.py