eric: comparison Project/Project.py

-:58fe260e7469
+:7ce719013078
 E5MessageBox.critical(
 self.ui,
 self.trUtf8("Registering Project Type"),
 self.trUtf8(
 """<p>The Programming Language <b>{0}</b> is not"""
-""" supported.</p>""")\
+""" supported.</p>""")
 .format(progLanguage)
 )
 return
 if type_ in self.__projectProgLanguages[progLanguage]:
 self.ui,
 self.trUtf8("Registering Project Type"),
 self.trUtf8(
 """<p>The Project type <b>{0}</b> is already"""
 """ registered with Programming Language"""
-""" <b>{1}</b>.</p>""")\
+""" <b>{1}</b>.</p>""")
 .format(type_, progLanguage)
 )
 return
 if type_ in self.__projectTypes:
 QApplication.restoreOverrideCursor()
 E5MessageBox.critical(
 self.ui,
 self.trUtf8("Read project file"),
 self.trUtf8(
-"<p>The project file <b>{0}</b> could not be read.</p>")\
+"<p>The project file <b>{0}</b> could not be read.</p>")
 .format(fn))
 return False
 self.pfile = os.path.abspath(fn)
 self.ppath = os.path.abspath(os.path.dirname(fn))
 else:
 E5MessageBox.critical(
 self.ui,
 self.trUtf8("Read tasks"),
 self.trUtf8(
-"<p>The tasks file <b>{0}</b> could not be read.</p>")\
+"<p>The tasks file <b>{0}</b> could not be read.</p>")
 .format(fn))
 def writeTasks(self):
 """
 Public method to write the tasks data to an XML file (.e4t).
 self.menuApidocAct.setEnabled(True)
 self.menuPackagersAct.setEnabled(True)
 self.pluginGrp.setEnabled(
 self.pdata["PROJECTTYPE"][0] == "E4Plugin")
 self.addLanguageAct.setEnabled(
-len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \
+len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
 self.pdata["TRANSLATIONPATTERN"][0] != '')
 self.projectAboutToBeCreated.emit()
 hash = str(QCryptographicHash.hash(
 self.trUtf8(
 """Would you like to edit the VCS"""
 """ command options?"""))
 if vcores:
 from VCS.CommandOptionsDialog import \
-vcsCommandOptionsDialog
+VcsCommandOptionsDialog
-codlg = vcsCommandOptionsDialog(self.vcs)
+codlg = VcsCommandOptionsDialog(self.vcs)
 if codlg.exec_() == QDialog.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # add project file to repository
 if res == 0:
 apres = E5MessageBox.yesNo(
 self.trUtf8("New Project"),
 self.trUtf8(
 """Would you like to edit the VCS command"""
 """ options?"""))
 if vcores:
-codlg = vcsCommandOptionsDialog(self.vcs)
+codlg = VcsCommandOptionsDialog(self.vcs)
 if codlg.exec_() == QDialog.Accepted:
 self.vcs.vcsSetOptions(codlg.getOptions())
 # create the project in the VCS
 self.vcs.vcsSetDataFromDict(vcsDataDict)
 from .UserPropertiesDialog import UserPropertiesDialog
 dlg = UserPropertiesDialog(self)
 if dlg.exec_() == QDialog.Accepted:
 dlg.storeData()
-if (self.pdata["VCS"] and \
+if (self.pdata["VCS"] and
 self.pdata["VCS"][0] != vcsSystem) or \
-(self.pudata["VCSOVERRIDE"] and \
+(self.pudata["VCSOVERRIDE"] and
 self.pudata["VCSOVERRIDE"][0] != vcsSystemOverride) or \
-(vcsSystemOverride is not None and \
+(vcsSystemOverride is not None and
 len(self.pudata["VCSOVERRIDE"]) == 0):
 # stop the VCS monitor thread and shutdown VCS
 if self.vcs is not None:
 self.vcs.stopStatusMonitor()
 self.vcs.vcsShutdown()
 if fn is None:
 fn = E5FileDialog.getOpenFileName(
 self.parent(),
 self.trUtf8("Open project"),
-Preferences.getMultiProject("Workspace") or \
+Preferences.getMultiProject("Workspace") or
 Utilities.getHomeDir(),
 self.trUtf8("Project Files (*.e4p)"))
 QApplication.processEvents()
 vcsSystem = vcsData[0][0]
 self.pdata["VCS"] = [vcsSystem]
 self.vcs = self.initVCS()
 self.setDirty(True)
 if self.vcs is not None and \
 (self.vcs.vcsRegisteredState(self.ppath) !=
 self.vcs.canBeCommitted):
 self.pdata["VCS"] = ['None']
 self.vcs = self.initVCS()
 self.closeAct.setEnabled(True)
 self.saveasAct.setEnabled(True)
 self.menuApidocAct.setEnabled(True)
 self.menuPackagersAct.setEnabled(True)
 self.pluginGrp.setEnabled(
 self.pdata["PROJECTTYPE"][0] == "E4Plugin")
 self.addLanguageAct.setEnabled(
-len(self.pdata["TRANSLATIONPATTERN"]) > 0 and \
+len(self.pdata["TRANSLATIONPATTERN"]) > 0 and
 self.pdata["TRANSLATIONPATTERN"][0] != '')
 self.__model.projectOpened()
 self.projectOpenedHooks.emit()
 self.projectOpened.emit()
 def __closeAllWindows(self):
 """
 Private method to close all project related windows.
 """
-self.codemetrics        and self.codemetrics.close()
+self.codemetrics and self.codemetrics.close()
-self.codecoverage       and self.codecoverage.close()
+self.codecoverage and self.codecoverage.close()
-self.profiledata        and self.profiledata.close()
+self.profiledata and self.profiledata.close()
 self.applicationDiagram and self.applicationDiagram.close()
-self.loadedDiagram      and self.loadedDiagram.close()
+self.loadedDiagram and self.loadedDiagram.close()
 def closeProject(self, reopen=False, noSave=False):
 """
 Public slot to close the current project.
 @param normalized flag indicating a normalized filename is wanted
 (boolean)
 @return list of the projects scripts (list of string)
 """
 if normalized:
 return [os.path.join(self.ppath, fn) for fn in
 self.pdata["SOURCES"]]
 else:
 return self.pdata["SOURCES"]
 def getProjectType(self):
 sorted(self.pdata["FILETYPES"].keys())):
 if fnmatch.fnmatch(bfn, pattern):
 filetype = self.pdata["FILETYPES"][pattern]
 break
 if (filetype == "SOURCES" and
 fn not in self.pdata["SOURCES"]) or \
 (filetype == "FORMS" and
 fn not in self.pdata["FORMS"]) or \
 (filetype == "INTERFACES" and
 fn not in self.pdata["INTERFACES"]) or \
 (filetype == "RESOURCES" and
 fn not in self.pdata["RESOURCES"]) or \
 (filetype == "OTHERS" and fn not in self.pdata["OTHERS"]):
 if autoInclude and AI:
 self.appendFile(ns)
 else:
 if fn is not None:
 tfn = Utilities.getTestFileName(fn)
 basename = os.path.splitext(fn)[0]
 tbasename = os.path.splitext(tfn)[0]
 self.codeProfileAct.setEnabled(
-os.path.isfile("{0}.profile".format(basename)) or \
+os.path.isfile("{0}.profile".format(basename)) or
 os.path.isfile("{0}.profile".format(tbasename)))
 self.codeCoverageAct.setEnabled(
-self.isPy3Project() and \
+self.isPy3Project() and
-(os.path.isfile("{0}.coverage".format(basename)) or \
+(os.path.isfile("{0}.coverage".format(basename)) or
 os.path.isfile("{0}.coverage".format(tbasename))))
 else:
 self.codeProfileAct.setEnabled(False)
 self.codeCoverageAct.setEnabled(False)
 lst_.extend(self.pdata[key])
 lst = []
 for entry in lst_:
 if os.path.isdir(self.getAbsolutePath(entry)):
 lst.extend(
 [self.getRelativePath(p) for p in
 Utilities.direntries(self.getAbsolutePath(entry), True)])
 continue
 else:
 lst.append(entry)
 lst.sort()
 self.ui,
 self.trUtf8("Create Plugin Archive"),
 self.trUtf8(
 """<p>The file <b>{0}</b> could not be stored """
 """in the archive. Ignoring it.</p>"""
-"""<p>Reason: {1}</p>""")\
+"""<p>Reason: {1}</p>""")
 .format(os.path.join(self.ppath, name), str(why)))
 archiveFile.writestr("VERSION", version.encode("utf-8"))
 archiveFile.close()
 if not archive in self.pdata["OTHERS"]:
 self.ui.showNotification(
 UI.PixmapCache.getPixmap("pluginArchive48.png"),
 self.trUtf8("Create Plugin Archive"),
 self.trUtf8(
 """<p>The eric5 plugin archive file <b>{0}</b> was """
-"""created successfully.</p>""")\
+"""created successfully.</p>""")
 .format(os.path.basename(archive)))
 else:
 E5MessageBox.information(
 self.ui,
 self.trUtf8("Create Plugin Archive"),

Mercurial Repositories > eric / file comparison

comparison: Project/Project.py

Project/Project.py