eric: comparison Project/Project.py

-:161992758137
+:6af5d12cfecb
 if self.pdata["MIXEDLANGUAGE"][0]:
 sourceKey = "Mixed"
 else:
 sourceKey = self.pdata["PROGLANGUAGE"][0]
 for ext in self.sourceExtensions[sourceKey]:
-self.pdata["FILETYPES"]["*%s" % ext] = "SOURCES"
+self.pdata["FILETYPES"]["*{0}".format(ext)] = "SOURCES"
 self.pdata["FILETYPES"]["*.idl"] = "INTERFACES"
 if self.pdata["PROJECTTYPE"][0] in ["Qt4", "E4Plugin", "PySide"]:
 self.pdata["FILETYPES"]["*.ui"] = "FORMS"
 self.pdata["FILETYPES"]["*.ui.h"] = "FORMS"
 if self.pdata["PROJECTTYPE"][0] in ["Qt4", "Qt4C", "E4Plugin",
 if self.pfile is None:
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4q' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4q'.format(fn))
 if os.path.exists(fn):
 try:
 f = open(fn, "r", encoding = "utf-8")
 parser = make_parser(True)
 if self.pfile is None:
 return
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4q' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4q'.format(fn))
 try:
 f = open(fn, "w", encoding = "utf-8")
 UserProjectWriter(f, os.path.splitext(os.path.basename(fn))[0]).writeXML()
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() in [".e4pz"]:
 fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4sz' % (fn, indicator))
+'{0}{1}.e4sz'.format(fn, indicator))
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 g = gzip.open(fn, "rb")
 f = io.StringIO(g.read().decode("utf-8"))
 g.close()
 else:
 fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4s' % (fn, indicator))
+'{0}{1}.e4s'.format(fn, indicator))
 f = open(fn, "r", encoding = "utf-8")
 line = f.readline()
 dtdLine = f.readline()
 f.close()
 except EnvironmentError:
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() == ".e4pz":
 fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4sz' % (fn, indicator))
+'{0}{1}.e4sz'.format(fn, indicator))
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 """ supported. The compression library is missing."""))
 return
 f = io.StringIO()
 else:
 fn = os.path.join(self.getProjectManagementDir(),
-'%s%s.e4s' % (fn, indicator))
+'{0}{1}.e4s'.format(fn, indicator))
 f = open(fn, "w", encoding = "utf-8")
 SessionWriter(f, os.path.splitext(os.path.basename(fn))[0]).writeXML()
 if fn.lower().endswith("e4sz"):
 self.trUtf8("Please save the project first."))
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
-for fn in [os.path.join(self.getProjectManagementDir(), "%s.e4sz" % fname),
+for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4sz".format(fname)),
-os.path.join(self.getProjectManagementDir(), "%s.e4s" % fname)]:
+os.path.join(self.getProjectManagementDir(), "{0}.e4s".format(fname))]:
 if os.path.exists(fn):
 try:
 os.remove(fn)
 except OSError:
 QMessageBox.critical(None,
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() in [".e4pz"]:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4tz' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4tz'.format(fn))
 if not os.path.exists(fn):
 return
 try:
 import gzip
 except ImportError:
 return
 g = gzip.open(fn, "rb")
 f = io.StringIO(g.read().decode("utf-8"))
 g.close()
 else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4t' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4t'.format(fn))
 if not os.path.exists(fn):
 return
 f = open(fn, "r", encoding = "utf-8")
 line = f.readline()
 dtdLine = f.readline()
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() == ".e4pz":
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4tz' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4tz'.format(fn))
 try:
 import gzip
 except ImportError:
 QMessageBox.critical(None,
 self.trUtf8("Save tasks"),
 self.trUtf8("""Compressed tasks files not supported."""
 """ The compression library is missing."""))
 return
 f = io.StringIO()
 else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4t' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4t'.format(fn))
 f = open(fn, "w", encoding = "utf-8")
 TasksWriter(f, True, os.path.splitext(os.path.basename(fn))[0]).writeXML()
 if fn.lower().endswith("e4tz"):
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() in [".e4pz"]:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4dz' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4dz'.format(fn))
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 return
 g = gzip.open(fn, "rb")
 f = io.StringIO(g.read().decode("utf-8"))
 g.close()
 else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4d' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4d'.format(fn))
 f = open(fn, "r", encoding = "utf-8")
 line = f.readline()
 dtdLine = f.readline()
 f.close()
 except EnvironmentError:
 fn, ext = os.path.splitext(os.path.basename(self.pfile))
 try:
 if ext.lower() == ".e4pz":
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4dz' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4dz'.format(fn))
 try:
 import gzip
 except ImportError:
 if not quiet:
 QMessageBox.critical(None,
 """ not supported. The compression library is"""
 """ missing."""))
 return
 f = io.StringIO()
 else:
-fn = os.path.join(self.getProjectManagementDir(), '%s.e4d' % fn)
+fn = os.path.join(self.getProjectManagementDir(), '{0}.e4d'.format(fn))
 f = open(fn, "w", encoding = "utf-8")
 DebuggerPropertiesWriter(f, os.path.splitext(os.path.basename(fn))[0])\
 .writeXML()
 self.trUtf8("Please save the project first."))
 return
 fname, ext = os.path.splitext(os.path.basename(self.pfile))
-for fn in [os.path.join(self.getProjectManagementDir(), "%s.e4dz" % fname),
+for fn in [os.path.join(self.getProjectManagementDir(), "{0}.e4dz".format(fname)),
-os.path.join(self.getProjectManagementDir(), "%s.e4d" % fname)]:
+os.path.join(self.getProjectManagementDir(), "{0}.e4d".format(fname))]:
 if os.path.exists(fn):
 try:
 os.remove(fn)
 except OSError:
 QMessageBox.critical(None,
 elif patterntype == "__IGNORE__":
 ignorePatterns.append(pattern)
 files = []
 for pattern in patterns:
-sstring = "%s%s%s" % (source, os.sep, pattern)
+sstring = "{0}{1}{2}".format(source, os.sep, pattern)
 files.extend(glob.glob(sstring))
 if len(files) == 0:
 if not quiet:
 QMessageBox.information(None,
 """
 try:
 os.remove(os.path.join(self.ppath, fn))
 dummy, ext = os.path.splitext(fn)
 if ext == '.ui':
-fn2 = os.path.join(self.ppath, '%s.h' % fn)
+fn2 = os.path.join(self.ppath, '{0}.h'.format(fn))
 if os.path.isfile(fn2):
 os.remove(fn2)
 except EnvironmentError:
 QMessageBox.critical(None,
 self.trUtf8("Delete file"),
 # the first entry determines the mainscript name
 mainscriptname = os.path.splitext(mainscript)[0] or \
 os.path.basename(tslist[0]).split('_')[0]
 self.pdata["TRANSLATIONPATTERN"] = \
 [os.path.join(os.path.dirname(tslist[0]),
-"%s_%%language%%%s" % (os.path.basename(tslist[0]).split('_')[0],
+"{0}_%language%{1}".format(os.path.basename(tslist[0]).split('_')[0],
 os.path.splitext(tslist[0])[1]))]
 else:
 pattern, ok = QInputDialog.getText(\
 None,
 self.trUtf8("Translation Pattern"),
 self.pdata["TRANSLATIONS"].append(ts)
 self.emit(SIGNAL('projectLanguageAdded'), ts)
 if len(self.pdata["MAINSCRIPT"]) == 0 or \
 len(self.pdata["MAINSCRIPT"][0]) == 0:
 if self.pdata["PROGLANGUAGE"][0] in ["Python", "Python3"]:
-self.pdata["MAINSCRIPT"] = ['%s.py' % mainscriptname]
+self.pdata["MAINSCRIPT"] = ['{0}.py'.format(mainscriptname)]
 elif self.pdata["PROGLANGUAGE"][0] == "Ruby":
-self.pdata["MAINSCRIPT"] = ['%s.rb' % mainscriptname]
+self.pdata["MAINSCRIPT"] = ['{0}.rb'.format(mainscriptname)]
 if self.pdata["TRANSLATIONSBINPATH"]:
 tpd = os.path.join(self.ppath,
 self.pdata["TRANSLATIONSBINPATH"][0])
 pattern = os.path.splitext(
 os.path.basename(self.pdata["TRANSLATIONPATTERN"][0]))
 self.recentMenu.clear()
 idx = 1
 for rp in self.recent:
 if idx < 10:
-formatStr = '&%d. %s'
+formatStr = '&{0:d}. {1}'
 else:
-formatStr = '%d. %s'
+formatStr = '{0:d}. {1}'
 act = self.recentMenu.addAction(\
-formatStr % (idx,
+formatStr.format(idx,
 Utilities.compactPath(rp, self.ui.maxMenuFilePathLen)))
 act.setData(rp)
 act.setEnabled(QFileInfo(rp).exists())
 idx += 1
 basename = os.path.splitext(fn)[0]
 tbasename = os.path.splitext(tfn)[0]
 # determine name of coverage file to be used
 files = []
-f = "%s.coverage" % basename
+f = "{0}.coverage".format(basename)
-tf = "%s.coverage" % tbasename
+tf = "{0}.coverage".format(tbasename)
 if os.path.isfile(f):
 files.append(f)
 if os.path.isfile(tf):
 files.append(tf)
 basename = os.path.splitext(fn)[0]
 tbasename = os.path.splitext(tfn)[0]
 # determine name of profile file to be used
 files = []
-f = "%s.profile" % basename
+f = "{0}.profile".format(basename)
-tf = "%s.profile" % tbasename
+tf = "{0}.profile".format(tbasename)
 if os.path.isfile(f):
 files.append(f)
 if os.path.isfile(tf):
 files.append(tf)
 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("%s.profile" % basename) or \
+os.path.isfile("{0}.profile".format(basename)) or \
-os.path.isfile("%s.profile" % tbasename))
+os.path.isfile("{0}.profile".format(tbasename)))
 self.codeCoverageAct.setEnabled(\
 self.pdata["PROGLANGUAGE"][0] == "Python3" and \
-(os.path.isfile("%s.coverage" % basename) or \
+(os.path.isfile("{0}.coverage".format(basename)) or \
-os.path.isfile("%s.coverage" % tbasename)))
+os.path.isfile("{0}.coverage".format(tbasename))))
 else:
 self.codeProfileAct.setEnabled(False)
 self.codeCoverageAct.setEnabled(False)
 self.emit(SIGNAL("showMenu"), "Show", self.showMenu)
 """
 if path == "" or path == "/" or path == "\\":
 return
 if not path.endswith("/") and not path.endswith("\\"):
-path = "%s/" % path
+path = "{0}/".format(path)
 if not path in zipFile.namelist():
 self.__createZipDirEntries(os.path.split(path[:-1])[0], zipFile)
 zipFile.writestr(path, b"")
 while lineno < len(sourcelines):
 if sourcelines[lineno].startswith("version = "):
 # found the line to modify
 datestr = time.strftime("%Y%m%d")
 lineend = sourcelines[lineno].replace(sourcelines[lineno].rstrip(), "")
-sversion = "%s-snapshot-%s" % \
+sversion = "{0}-snapshot-{1}".format(
-(sourcelines[lineno].replace("version = ", "").strip()[1:-1],
+sourcelines[lineno].replace("version = ", "").strip()[1:-1],
 datestr)
-sourcelines[lineno] = '%s + "-snapshot-%s"%s' % \
+sourcelines[lineno] = '{0} + "-snapshot-{1}"{2}'.format(
-(sourcelines[lineno].rstrip(), datestr, lineend)
+sourcelines[lineno].rstrip(), datestr, lineend)
 break
 lineno += 1
 source = Utilities.encode("".join(sourcelines), encoding)[0]

Mercurial Repositories > eric / file comparison

comparison: Project/Project.py

Project/Project.py