eric: comparison Project/Project.py

-:092aa8fafa4e
+:f6ccc31d6e72
 from E4Gui.E4Action import E4Action, createActionGroup
 import Preferences
 import Utilities
-from eric4config import getConfig
+from eric5config import getConfig
 class Project(QObject):
 """
 Class implementing the project management functionality.
 self.pdata[index].remove(file)
 self.setDirty(True)
 def __readProject(self, fn):
 """
-Private method to read in a project (.e4p, .e4pz, .e3p, .e3pz) file.
+Private method to read in a project (.e4p, .e4pz) file.
 @param fn filename of the project file to be read (string)
 @return flag indicating success
 """
 try:
-if fn.lower().endswith("e4pz") or fn.lower().endswith("e3pz"):
+if fn.lower().endswith("e4pz"):
 try:
 import gzip
 except ImportError:
 QApplication.restoreOverrideCursor()
 QMessageBox.critical(None,
 for fn in self.pdata["OTHERS"]:
 dn = os.path.dirname(fn)
 if dn not in self.otherssubdirs:
 self.otherssubdirs.append(dn)
-if self.pfile.endswith('e3p') or self.pfile.endswith('e3pz'):
-# needs conversion to new format
-self.setDirty(True)
 return res
 def __readXMLProject(self, fn, validating):
 """
 Private method to read the project data from an XML file.
 @param fn filename of the project file to be read (string)
 @param validating flag indicating a validation of the XML file is
 requested (boolean)
 @return flag indicating success (boolean)
 """
-if fn.lower().endswith("e4pz") or fn.lower().endswith("e3pz"):
+if fn.lower().endswith("e4pz"):
 # work around for a bug in xmlproc
 validating = False
 parser = make_parser(validating)
 handler = ProjectHandler(self)
 parser.setContentHandler(handler)
 parser.setEntityResolver(er)
 parser.setErrorHandler(eh)
 try:
-if fn.lower().endswith("e4pz") or fn.lower().endswith("e3pz"):
+if fn.lower().endswith("e4pz"):
 try:
 import gzip
 except ImportError:
 QApplication.restoreOverrideCursor()
 QMessageBox.critical(None,
 def __writeUserProperties(self):
 """
 Private method to write the project data to an XML file.
 """
-if self.pfile is None or \
+if self.pfile is None:
-self.pfile.endswith('e3p') or \
-self.pfile.endswith('e3pz'):
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 fn = os.path.join(self.getProjectManagementDir(), '%s.e4q' % fn)
 self.trUtf8("<p>The user specific project properties file <b>{0}</b>"
 " could not be written.</p>").format(fn))
 def __readSession(self, quiet = False, indicator = ""):
 """
-Private method to read in the project session file (.e4s, .e3s)
+Private method to read in the project session file (.e4s)
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 @keyparam indicator indicator string (string)
 """
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
-if ext.lower() in [".e4pz", ".e3pz"]:
+if ext.lower() in [".e4pz"]:
-if ext.lower() == ".e3pz":
+fn = os.path.join(self.getProjectManagementDir(),
-fn = os.path.join(self.ppath, '%s.e3sz' % fn)
+'%s%s.e4sz' % (fn, indicator))
-else:
-fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4sz' % (fn, indicator))
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 self.trUtf8("""Compressed project session files not"""
 """ supported. The compression library is missing."""))
 return
 f = gzip.open(fn, "r")
 else:
-if ext.lower() == ".e3p":
+fn = os.path.join(self.getProjectManagementDir(),
-fn = os.path.join(self.ppath, '%s.e3s' % fn)
+'%s%s.e4s' % (fn, indicator))
-else:
-fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4s' % (fn, indicator))
 f = open(fn, "r")
 line = f.readline()
 dtdLine = f.readline()
 f.close()
 except EnvironmentError:
 @param validating flag indicating a validation of the XML file is
 requested (boolean)
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 """
-if fn.lower().endswith("e4sz") or fn.lower().endswith("e3sz"):
+if fn.lower().endswith("e4sz"):
 # work around for a bug in xmlproc
 validating = False
 parser = make_parser(validating)
 handler = SessionHandler(self)
 parser.setContentHandler(handler)
 parser.setEntityResolver(er)
 parser.setErrorHandler(eh)
 try:
-if fn.lower().endswith("e4sz") or fn.lower().endswith("e3sz"):
+if fn.lower().endswith("e4sz"):
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 @keyparam indicator indicator string (string)
 """
-if self.pfile is None or \
+if self.pfile is None:
-self.pfile.endswith('e3p') or \
-self.pfile.endswith('e3pz'):
 if not quiet:
 QMessageBox.critical(None,
 self.trUtf8("Save project session"),
 self.trUtf8("Please save the project first."))
 return
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
 for fn in [os.path.join(self.getProjectManagementDir(), "%s.e4sz" % fname),
-os.path.join(self.getProjectManagementDir(), "%s.e4s" % fname),
+os.path.join(self.getProjectManagementDir(), "%s.e4s" % fname)]:
-os.path.join(self.ppath, "%s.e3sz" % fname),
-os.path.join(self.ppath, "%s.e3s" % fname)]:
 if os.path.exists(fn):
 try:
 os.remove(fn)
 except OSError:
 QMessageBox.critical(None,
 self.trUtf8("<p>The project session file <b>{0}</b> could not be"
 " deleted.</p>").format(fn))
 def __readTasks(self):
 """
-Private method to read in the project tasks file (.e4t, .e3t)
+Private method to read in the project tasks file (.e4t)
 """
 if self.pfile is None:
 QMessageBox.critical(None,
 self.trUtf8("Read tasks"),
 self.trUtf8("Please save the project first."))
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
-if ext.lower() in [".e4pz", "*.e3pz"]:
+if ext.lower() in [".e4pz"]:
-if ext.lower() == ".e3pz":
+fn = os.path.join(self.getProjectManagementDir(), '%s.e4tz' % fn)
-fn = os.path.join(self.ppath, '%s.e3tz' % fn)
-else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4tz' % fn)
 if not os.path.exists(fn):
 return
 try:
 import gzip
 except ImportError:
 self.trUtf8("""Compressed tasks files not supported."""
 """ The compression library is missing."""))
 return
 f = gzip.open(fn, "r")
 else:
-if ext.lower() == ".e3p":
+fn = os.path.join(self.getProjectManagementDir(), '%s.e4t' % fn)
-fn = os.path.join(self.ppath, '%s.e3t' % fn)
-else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4t' % fn)
 if not os.path.exists(fn):
 return
 f = open(fn, "r")
 line = f.readline()
 dtdLine = f.readline()
 @param fn filename of the project tasks file to be read (string)
 @param validating flag indicating a validation of the XML file is
 requested (boolean)
 """
-if fn.lower().endswith("e4tz") or fn.lower().endswith("e3tz"):
+if fn.lower().endswith("e4tz"):
 # work around for a bug in xmlproc
 validating = False
 parser = make_parser(validating)
 handler = TasksHandler(1)
 parser.setContentHandler(handler)
 parser.setEntityResolver(er)
 parser.setErrorHandler(eh)
 try:
-if fn.lower().endswith("e4tz") or fn.lower().endswith("e3tz"):
+if fn.lower().endswith("e4tz"):
 try:
 import gzip
 except ImportError:
 QMessageBox.critical(None,
 self.trUtf8("Read tasks"),
 self.trUtf8("<p>The tasks file <b>{0}</b> could not be written.</p>")
 .format(fn))
 def __readDebugProperties(self, quiet = False):
 """
-Private method to read in the project debugger properties file (.e4d, .e3d)
+Private method to read in the project debugger properties file (.e4d)
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 """
 if self.pfile is None:
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
-if ext.lower() in [".e4pz", "*.e3pz"]:
+if ext.lower() in [".e4pz"]:
-if ext.lower() == ".e3pz":
+fn = os.path.join(self.getProjectManagementDir(), '%s.e4dz' % fn)
-fn = os.path.join(self.ppath, '%s.e3dz' % fn)
-else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4dz' % fn)
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 """ supported. The compression library is"""
 """ missing."""))
 return
 f = gzip.open(fn, "r")
 else:
-if ext.lower() == ".e3p":
+fn = os.path.join(self.getProjectManagementDir(), '%s.e4d' % fn)
-fn = os.path.join(self.ppath, '%s.e3d' % fn)
-else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4d' % fn)
 f = open(fn, "r")
 line = f.readline()
 dtdLine = f.readline()
 f.close()
 except EnvironmentError:
 @param validating flag indicating a validation of the XML file is
 requested (boolean)
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 """
-if fn.lower().endswith("e4dz") or fn.lower().endswith("e3dz"):
+if fn.lower().endswith("e4dz"):
 # work around for a bug in xmlproc
 validating = False
 parser = make_parser(validating)
 handler = DebuggerPropertiesHandler(self)
 parser.setContentHandler(handler)
 parser.setEntityResolver(er)
 parser.setErrorHandler(eh)
 try:
-if fn.lower().endswith("e4dz") or fn.lower().endswith("e3dz"):
+if fn.lower().endswith("e4dz"):
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 Private method to write the project debugger properties file (.e4d)
 @param quiet flag indicating quiet operations.
 If this flag is true, no errors are reported.
 """
-if self.pfile is None or \
+if self.pfile is None:
-self.pfile.endswith('e3p') or \
-self.pfile.endswith('e3pz'):
 if not quiet:
 QMessageBox.critical(None,
 self.trUtf8("Save debugger properties"),
 self.trUtf8("Please save the project first."))
 return
 " not be written.</p>")
 .format(fn))
 def __deleteDebugProperties(self):
 """
-Private method to delete the project debugger properties file (.e3d)
+Private method to delete the project debugger properties file (.e4d)
 """
 if self.pfile is None:
 if not quiet:
 QMessageBox.critical(None,
 self.trUtf8("Delete debugger properties"),
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
 for fn in [os.path.join(self.getProjectManagementDir(), "%s.e4dz" % fname),
-os.path.join(self.getProjectManagementDir(), "%s.e4d" % fname),
+os.path.join(self.getProjectManagementDir(), "%s.e4d" % fname)]:
-os.path.join(self.ppath, "%s.e3dz" % fname),
-os.path.join(self.ppath, "%s.e3d" % fname)]:
 if os.path.exists(fn):
 try:
 os.remove(fn)
 except OSError:
 QMessageBox.critical(None,
 if fn is None:
 fn = QFileDialog.getOpenFileName(\
 self.parent(),
 self.trUtf8("Open project"),
 "",
-self.trUtf8("Project Files (*.e4p *.e4pz *.e3p *.e3pz)"))
+self.trUtf8("Project Files (*.e4p *.e4pz)"))
 QApplication.processEvents()
 if fn:
 if self.closeProject():
 @return flag indicating success
 """
 if self.isDirty():
 if len(self.pfile) > 0:
-if self.pfile.endswith("e3pz") or self.pfile.endswith("e3p"):
+ok = self.__writeProject()
-ok = self.saveProjectAs()
-else:
-ok = self.__writeProject()
 else:
 ok = self.saveProjectAs()
 else:
 ok = True
 self.sessActGrp.setEnabled(ok)
 Public method to get the path of the management directory.
 @return path of the management directory (string)
 """
 if Utilities.isWindowsPlatform():
-return os.path.join(self.ppath, "_eric4project")
+return os.path.join(self.ppath, "_eric5project")
 else:
-return os.path.join(self.ppath, ".eric4project")
+return os.path.join(self.ppath, ".eric5project")
 def isProjectFile(self, fn):
 """
 Public method used to check, if the passed in filename belongs to the project.
 self.pluginPkgListAct = E4Action(self.trUtf8('Create Package List'),
 UI.PixmapCache.getIcon("pluginArchiveList.png"),
 self.trUtf8('Create &Package List'), 0, 0,
 self.pluginGrp,'project_plugin_pkglist')
 self.pluginPkgListAct.setStatusTip(\
-self.trUtf8('Create an initial PKGLIST file for an eric4 plugin.'))
+self.trUtf8('Create an initial PKGLIST file for an eric5 plugin.'))
 self.pluginPkgListAct.setWhatsThis(self.trUtf8(
 """<b>Create Package List</b>"""
-"""<p>This creates an initial list of files to include in an eric4 """
+"""<p>This creates an initial list of files to include in an eric5 """
 """plugin archive. The list is created from the project file.</p>"""
 ))
 self.connect(self.pluginPkgListAct, SIGNAL('triggered()'),
 self.__pluginCreatePkgList)
 self.actions.append(self.pluginPkgListAct)
 self.pluginArchiveAct = E4Action(self.trUtf8('Create Plugin Archive'),
 UI.PixmapCache.getIcon("pluginArchive.png"),
 self.trUtf8('Create Plugin &Archive'), 0, 0,
 self.pluginGrp,'project_plugin_archive')
 self.pluginArchiveAct.setStatusTip(\
-self.trUtf8('Create an eric4 plugin archive file.'))
+self.trUtf8('Create an eric5 plugin archive file.'))
 self.pluginArchiveAct.setWhatsThis(self.trUtf8(
 """<b>Create Plugin Archive</b>"""
-"""<p>This creates an eric4 plugin archive file using the list of files """
+"""<p>This creates an eric5 plugin archive file using the list of files """
 """given in the PKGLIST file. The archive name is built from the main """
 """script name.</p>"""
 ))
 self.connect(self.pluginArchiveAct, SIGNAL('triggered()'),
 self.__pluginCreateArchive)
 self.pluginSArchiveAct = E4Action(self.trUtf8('Create Plugin Archive (Snapshot)'),
 UI.PixmapCache.getIcon("pluginArchiveSnapshot.png"),
 self.trUtf8('Create Plugin Archive (&Snapshot)'), 0, 0,
 self.pluginGrp,'project_plugin_sarchive')
 self.pluginSArchiveAct.setStatusTip(\
-self.trUtf8('Create an eric4 plugin archive file (snapshot release).'))
+self.trUtf8('Create an eric5 plugin archive file (snapshot release).'))
 self.pluginSArchiveAct.setWhatsThis(self.trUtf8(
 """<b>Create Plugin Archive (Snapshot)</b>"""
-"""<p>This creates an eric4 plugin archive file using the list of files """
+"""<p>This creates an eric5 plugin archive file using the list of files """
 """given in the PKGLIST file. The archive name is built from the main """
 """script name. The version entry of the main script is modified to """
 """reflect a snapshot release.</p>"""
 ))
 self.connect(self.pluginSArchiveAct, SIGNAL('triggered()'),
 if not "PKGLIST" in self.pdata["OTHERS"]:
 self.appendFile("PKGLIST")
 def __pluginCreateArchive(self, snapshot = False):
 """
-Private slot to create an eric4 plugin archive.
+Private slot to create an eric5 plugin archive.
 @param snapshot flag indicating a snapshot archive (boolean)
 """
 pkglist = os.path.join(self.ppath, "PKGLIST")
 if not os.path.exists(pkglist):
 except RuntimeError:
 archiveFile = zipfile.ZipFile(archive, "w")
 except IOError as why:
 QMessageBox.critical(None,
 self.trUtf8("Create Plugin Archive"),
-self.trUtf8("""<p>The eric4 plugin archive file <b>{0}</b> could """
+self.trUtf8("""<p>The eric5 plugin archive file <b>{0}</b> could """
 """not be created.</p>"""
 """<p>Reason: {1}</p>""").format(archive, str(why)),
 QMessageBox.StandardButtons(\
 QMessageBox.Ok))
 return
 if not archive in self.pdata["OTHERS"]:
 self.appendFile(archive)
 QMessageBox.information(None,
 self.trUtf8("Create Plugin Archive"),
-self.trUtf8("""<p>The eric4 plugin archive file <b>{0}</b> was """
+self.trUtf8("""<p>The eric5 plugin archive file <b>{0}</b> was """
 """created successfully.</p>""").format(archive),
 QMessageBox.StandardButtons(\
 QMessageBox.Ok))
 def __pluginCreateSnapshotArchive(self):
 """
-Private slot to create an eric4 plugin archive snapshot release.
+Private slot to create an eric5 plugin archive snapshot release.
 """
 self.__pluginCreateArchive(True)
 def __createZipDirEntries(self, path, zipFile):
 """

Mercurial Repositories > eric / file comparison

comparison: Project/Project.py

Project/Project.py