Django Project: comparison ProjectDjango/Project.py

-:ac18f6f98ffc
+:80afe6639c6c
 if not res:
 # user selected to not overwrite
 return
 try:
-f = open(fname, "w")
+with open(fname, "w") as f:
 f.write('<!DOCTYPE html>')
 f.write('<html>\n')
 f.write('  <head>\n')
 f.write('    <meta content="" />\n')
 f.write('    <title></title>\n')
 f.write('    <link rel="stylesheet" type="text/css"'
 ' href="style.css"/>')
 f.write('    <!--[if lte IE 7]>')
 f.write('      <link rel="stylesheet" type="text/css"'
 ' href="ie.css"/>')
 f.write('    <![endif]-->')
 f.write('  </head>\n')
 f.write('\n')
 f.write('  <body  class="bodyclass">\n')
 f.write('    <div id="container">')
 f.write('    </div>')
 f.write('  </body>\n')
 f.close()
 f.write('</html>\n')
-f.close()
 except (IOError, OSError) as e:
 E5MessageBox.critical(
 self.__ui,
 self.tr("New Form"),
 self.tr("<p>The new form file <b>{0}</b> could not be"
 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
 modal=True,
 buttons=E5MessageBox.Ok)
 msgBox.setIconPixmap(UI.PixmapCache.getPixmap(
 os.path.join("ProjectDjango", "icons",
 "django64-{0}".format(self.__iconSuffix))))
-msgBox.exec_()
+msgBox.exec()
 def getDjangoVersionString(self):
 """
 Public method to get the Django version as a string.
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("Django project created successfully."))
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 # create the base directory for translations
 i18nPath = os.path.join(path, projectName, "locale")
 if not os.path.exists(i18nPath):
 os.makedirs(i18nPath)
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("Django application created successfully."))
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 return res
 def __startGlobalApplication(self):
 """
 Private slot to start a new global Django application.
 return
 dia = DjangoDialog(title, fixed=True, linewrap=False)
 res = dia.startProcess(args, path, False)
 if res:
-dia.exec_()
+dia.exec()
 def __databaseFlush(self):
 """
 Private slot to return all database tables to the state just after
 their installation.
 title,
 msgSuccess=self.tr("Database tables flushed"
 " successfully."))
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 def __runDatabaseClient(self):
 """
 Private slot to start a database client for a Django project.
 """
 dia = DjangoDialog(title, fixed=True, linewrap=False,
 saveFilters=fileFilter)
 res = dia.startProcess(args, path, False)
 if res:
-dia.exec_()
+dia.exec()
 def __databaseSqlCreateTables(self):
 """
 Private slot to print the CREATE TABLE SQL statements for one
 or more applications.
 DjangoMigrationSelectionDialog
 )
 dlg = DjangoMigrationSelectionDialog(migrations,
 migrationRequired=True,
 suffix=self.__iconSuffix)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 app, migration = dlg.getData()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 dia = DjangoDialog(title, fixed=True, linewrap=False,
 saveFilters=fileFilter)
 res = dia.startProcess(args, path, False)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement migration related functions
 ##################################################################
 from .DjangoMigrationSelectionDialog import (
 DjangoMigrationSelectionDialog
 )
 dlg = DjangoMigrationSelectionDialog(migrations,
 suffix=self.__iconSuffix)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 app, migration = dlg.getData()
 self.applyMigrations(app=app, migration=migration)
 def applyMigrations(self, app=None, migration=None):
 """
 args.append(migration)
 dia = DjangoDialog(title)
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 def __unapplyMigrations(self):
 """
 Private slot to un-apply all migrations of an application.
 """
 """
 Private slot to generate migrations for the Django project.
 """
 from .DjangoMakeMigrationsDialog import DjangoMakeMigrationsDialog
 dlg = DjangoMakeMigrationsDialog(self.getRecentApplications())
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 apps, migration, dryRun, empty, merge = dlg.getData()
 if apps:
 self.setMostRecentApplication(apps)
 apps = apps.split()
 self.makeMigrations(apps, migration, dryRun, empty, merge)
 args += apps
 dia = DjangoDialog(title, showInput=True)
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 def __squashMigrations(self):
 """
 Private slot to squash migrations.
 """
 from .DjangoSquashMigrationSelectionDialog import (
 DjangoSquashMigrationSelectionDialog
 )
 dlg = DjangoSquashMigrationSelectionDialog(
 migrations, self, self.__iconSuffix)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 app, start, end, noOptimize, name = dlg.getData()
 title = self.tr("Squash Migrations")
 try:
 args.append(end)
 dia = DjangoDialog(title)
 res = dia.startProcess(args, path)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement some tool functions
 ##################################################################
 """
 title = self.tr("Diff Settings")
 from .DjangoDiffsettingsDataDialog import DjangoDiffsettingsDataDialog
 dlg = DjangoDiffsettingsDataDialog(self, self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 showAll, defaultModule, outputFormat = dlg.getData()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 return
 dia = DjangoDialog(title, fixed=True, linewrap=False)
 res = dia.startProcess(args, path, False)
 if res:
-dia.exec_()
+dia.exec()
 def __runPythonShell(self):
 """
 Private slot to start a Python console for a Django project.
 """
 from .DjangoSendTestEmailDataDialog import (
 DjangoSendTestEmailDataDialog
 )
 dlg = DjangoSendTestEmailDataDialog(self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 managers, admins, recipients = dlg.getData()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 msgSuccess=self.tr("Test Email sent successfully."),
 msgError=self.tr("Test Email could not be sent.")
 )
 res = dia.startProcess(args, path, False)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement caching functions
 ##################################################################
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("Cache tables created successfully."))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement testing functions
 ##################################################################
 except DjangoNoSiteSelectedException:
 return
 from .DjangoDumpdataDataDialog import DjangoDumpdataDataDialog
 dlg = DjangoDumpdataDataDialog(self, self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 appls, excls, dumpFormat, indent = dlg.getData()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 dia = DjangoDialog(
 title, fixed=True, linewrap=False, saveFilters=fileFilters)
 res = dia.startProcess(args, wd, showCommand=False)
 if res:
-dia.exec_()
+dia.exec()
 def __loadData(self):
 """
 Private slot to load data from fixture files.
 """
 except DjangoNoSiteSelectedException:
 return
 from .DjangoLoaddataDataDialog import DjangoLoaddataDataDialog
 dlg = DjangoLoaddataDataDialog(self, self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 fixtures, excludes, appLabel, ignore = dlg.getData()
 args = []
 args.append(self.__getPythonExecutable())
 args.append("manage.py")
 args += fixtures
 dia = DjangoDialog(title)
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 def __runTestSuite(self, deprecation=False):
 """
 Private slot to run the test suite for applications or the whole site.
 from .DjangoTestDataDialog import DjangoTestDataDialog
 dlg = DjangoTestDataDialog(
 self, self.__plugin.getPreferences("KeepTestDatabase"),
 self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 labels, pattern, tags, excludeTags, keep, reverse = (
 dlg.getData())
 self.__plugin.setPreferences("KeepTestDatabase", keep)
 if consoleCmd:
 from .DjangoRunTestServerDataDialog import (
 DjangoRunTestServerDataDialog
 )
 dlg = DjangoRunTestServerDataDialog(self, self.__ui)
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 fixtures = dlg.getData()
 args = Utilities.parseOptionString(consoleCmd)
 args[0] = Utilities.getExecutablePath(args[0])
 args.append(self.__getPythonExecutable())
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("Expired sessions cleared successfully."))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 ##################################################################
 ## slots below implement translation functions
 ##################################################################
 title,
 msgSuccess=self.tr(
 "\nMessage catalog initialized successfully."))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 langFile = (
 self.__e5project.getTranslationPattern()
 .replace("%language%", code)
 )
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startBatchProcesses(argsLists, wd)
 if res:
-dia.exec_()
+dia.exec()
 def updateSelectedCatalogsWithObsolete(self, filenames):
 """
 Public method to update the message catalogs keeping obsolete messages.
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startBatchProcesses(argsLists, wd)
 if res:
-dia.exec_()
+dia.exec()
 def updateCatalogs(self, filenames):
 """
 Public method to update the message catalogs.
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 def updateCatalogsWithObsolete(self, filenames):
 """
 Public method to update the message catalogs keeping obsolete messages.
 dia = DjangoDialog(
 title,
 msgSuccess=self.tr("\nMessage catalogs updated successfully."))
 res = dia.startProcess(args, wd)
 if res:
-dia.exec_()
+dia.exec()
 def compileSelectedCatalogs(self, filenames):
 """
 Public method to update the message catalogs.
 title,
 msgSuccess=self.tr(
 "\nMessage catalogs compiled successfully."))
 res = dia.startBatchProcesses(argsLists, wd, mergedOutput=True)
 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'):
 title,
 msgSuccess=self.tr(
 "\nMessage catalogs compiled successfully."))
 res = dia.startProcess(args, wd, mergedOutput=True)
 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'):
 from .DjangoCheckOptionsDialog import DjangoCheckOptionsDialog
 dlg = DjangoCheckOptionsDialog(
 self.__getPythonExecutable(), path, self.getRecentApplications(),
 self.__plugin.getPreferences("CheckDeployMode"),
 )
-if dlg.exec_() == QDialog.Accepted:
+if dlg.exec() == QDialog.Accepted:
 deploy, tags, appsStr, settingsFile = dlg.getData()
 self.__plugin.setPreferences("CheckDeployMode", deploy)
 if appsStr != "":
 self.setMostRecentApplication(appsStr)
 apps = appsStr.split()
 args += apps
 dia = DjangoDialog(self.tr("Check Project"))
 res = dia.startProcess(args, path, mergedOutput=True)
 if res:
-dia.exec_()
+dia.exec()

Mercurial Repositories > Django Project / file comparison

comparison: ProjectDjango/Project.py

ProjectDjango/Project.py