--- a/E5XML/SessionWriter.py Tue Jul 27 08:25:53 2010 +0200
+++ b/E5XML/SessionWriter.py Tue Jul 27 09:10:10 2010 +0200
@@ -45,27 +45,27 @@
XMLWriterBase.writeXML(self)
- self._write('<!DOCTYPE Session SYSTEM "Session-%s.dtd">' % \
- sessionFileFormatVersion)
+ self._write('<!DOCTYPE Session SYSTEM "Session-{0}.dtd">'.format(
+ sessionFileFormatVersion))
# add some generation comments
if not isGlobal:
- self._write("<!-- eric5 session file for project %s -->" % self.name)
+ self._write("<!-- eric5 session file for project {0} -->".format(self.name))
self._write("<!-- This file was generated automatically, do not edit. -->")
if Preferences.getProject("XMLTimestamp") or isGlobal:
- self._write("<!-- Saved: %s -->" % time.strftime('%Y-%m-%d, %H:%M:%S'))
+ self._write("<!-- Saved: {0} -->".format(time.strftime('%Y-%m-%d, %H:%M:%S')))
# add the main tag
- self._write('<Session version="%s">' % sessionFileFormatVersion)
+ self._write('<Session version="{0}">'.format(sessionFileFormatVersion))
# step 0: save open multi project and project for the global session
if isGlobal:
if self.multiProject.isOpen():
- self._write(' <MultiProject>%s</MultiProject>' % \
- self.multiProject.getMultiProjectFile())
+ self._write(' <MultiProject>{0}</MultiProject>'.format(
+ self.multiProject.getMultiProjectFile()))
if self.project.isOpen():
- self._write(' <Project>%s</Project>' % \
- self.project.getProjectFile())
+ self._write(' <Project>{0}</Project>'.format(
+ self.project.getProjectFile()))
# step 1: save all open (project) filenames and the active window
allOpenFiles = self.vm.getOpenFilenames()
@@ -81,9 +81,9 @@
line, index = 0, 0
folds = ''
zoom = -9999
- self._write(' <Filename cline="%d" cindex="%d" folds="%s" zoom="%d">'
- '%s</Filename>' % \
- (line, index, folds, zoom, of))
+ self._write(
+ ' <Filename cline="{0:d}" cindex="{1:d}" folds="{2}" zoom="{3:d}">'
+ '{4}</Filename>'.format(line, index, folds, zoom, of))
self._write(" </Filenames>")
aw = self.vm.getActiveName()
@@ -93,8 +93,8 @@
line, index = ed.getCursorPosition()
else:
line, index = 0, 0
- self._write(' <ActiveWindow cline="%d" cindex="%d">%s</ActiveWindow>' % \
- (line, index, aw))
+ self._write(' <ActiveWindow cline="{0:d}" cindex="{1:d}">{2}</ActiveWindow>'\
+ .format(line, index, aw))
# step 2a: save all breakpoints
allBreaks = Preferences.getProject("SessionAllBreakpoints")
@@ -107,12 +107,13 @@
bpModel.getBreakPointByIndex(index)[:6]
if isGlobal or allBreaks or fname in projectFiles:
self._write(" <Breakpoint>")
- self._write(" <BpFilename>%s</BpFilename>" % fname)
- self._write(' <Linenumber value="%d" />' % lineno)
- self._write(" <Condition>%s</Condition>" % self.escape(str(cond)))
- self._write(' <Temporary value="%s" />' % temp)
- self._write(' <Enabled value="%s" />' % enabled)
- self._write(' <Count value="%d" />' % count)
+ self._write(" <BpFilename>{0}</BpFilename>".format(fname))
+ self._write(' <Linenumber value="{0:d}" />'.format(lineno))
+ self._write(" <Condition>{0}</Condition>".format(
+ self.escape(str(cond))))
+ self._write(' <Temporary value="{0}" />'.format(temp))
+ self._write(' <Enabled value="{0}" />'.format(enabled))
+ self._write(' <Count value="{0:d}" />'.format(count))
self._write(" </Breakpoint>")
self._write(" </Breakpoints>")
@@ -123,11 +124,11 @@
index = wpModel.index(row, 0)
cond, temp, enabled, count, special = wpModel.getWatchPointByIndex(index)[:5]
self._write(' <Watchexpression>')
- self._write(" <Condition>%s</Condition>" % self.escape(str(cond)))
- self._write(' <Temporary value="%s" />' % temp)
- self._write(' <Enabled value="%s" />' % enabled)
- self._write(' <Count value="%d" />' % count)
- self._write(' <Special>%s</Special>' % special)
+ self._write(" <Condition>{0}</Condition>".format(self.escape(str(cond))))
+ self._write(' <Temporary value="{0}" />'.format(temp))
+ self._write(' <Enabled value="{0}" />'.format(enabled))
+ self._write(' <Count value="{0:d}" />'.format(count))
+ self._write(' <Special>{0}</Special>'.format(special))
self._write(' </Watchexpression>')
self._write(' </Watchexpressions>')
@@ -146,45 +147,48 @@
dbgEnv = self.dbg.envHistory[0]
else:
dbgEnv = ""
- self._write(" <CommandLine>%s</CommandLine>" % self.escape(dbgCmdline))
- self._write(" <WorkingDirectory>%s</WorkingDirectory>" % dbgWd)
- self._write(" <Environment>%s</Environment>" % dbgEnv)
- self._write(' <ReportExceptions value="%s" />' % self.dbg.exceptions)
+ self._write(" <CommandLine>{0}</CommandLine>"\
+ .format(self.escape(dbgCmdline)))
+ self._write(" <WorkingDirectory>{0}</WorkingDirectory>".format(dbgWd))
+ self._write(" <Environment>{0}</Environment>".format(dbgEnv))
+ self._write(' <ReportExceptions value="{0}" />'\
+ .format(self.dbg.exceptions))
self._write(" <Exceptions>")
for exc in self.dbg.excList:
- self._write(" <Exception>%s</Exception>" % exc)
+ self._write(" <Exception>{0}</Exception>".format(exc))
self._write(" </Exceptions>")
self._write(" <IgnoredExceptions>")
for iexc in self.dbg.excIgnoreList:
- self._write(" <IgnoredException>%s</IgnoredException>" % iexc)
+ self._write(" <IgnoredException>{0}</IgnoredException>".format(iexc))
self._write(" </IgnoredExceptions>")
- self._write(' <AutoClearShell value="%s" />' % self.dbg.autoClearShell)
- self._write(' <TracePython value="%s" />' % self.dbg.tracePython)
- self._write(' <AutoContinue value="%s" />' % self.dbg.autoContinue)
+ self._write(' <AutoClearShell value="{0}" />'\
+ .format(self.dbg.autoClearShell))
+ self._write(' <TracePython value="{0}" />'.format(self.dbg.tracePython))
+ self._write(' <AutoContinue value="{0}" />'.format(self.dbg.autoContinue))
self._write(" <CovexcPattern></CovexcPattern>") # kept for compatibility
else:
- self._write(" <CommandLine>%s</CommandLine>" % \
- self.escape(str(self.project.dbgCmdline)))
- self._write(" <WorkingDirectory>%s</WorkingDirectory>" % \
- self.project.dbgWd)
- self._write(" <Environment>%s</Environment>" % \
- self.project.dbgEnv)
- self._write(' <ReportExceptions value="%s" />' % \
- self.project.dbgReportExceptions)
+ self._write(" <CommandLine>{0}</CommandLine>".format(
+ self.escape(str(self.project.dbgCmdline))))
+ self._write(" <WorkingDirectory>{0}</WorkingDirectory>".format(
+ self.project.dbgWd))
+ self._write(" <Environment>{0}</Environment>".format(
+ self.project.dbgEnv))
+ self._write(' <ReportExceptions value="{0}" />'.format(
+ self.project.dbgReportExceptions))
self._write(" <Exceptions>")
for exc in self.project.dbgExcList:
- self._write(" <Exception>%s</Exception>" % exc)
+ self._write(" <Exception>{0}</Exception>".format(exc))
self._write(" </Exceptions>")
self._write(" <IgnoredExceptions>")
for iexc in self.project.dbgExcIgnoreList:
- self._write(" <IgnoredException>%s</IgnoredException>" % iexc)
+ self._write(" <IgnoredException>{0}</IgnoredException>".format(iexc))
self._write(" </IgnoredExceptions>")
- self._write(' <AutoClearShell value="%s" />' % \
- self.project.dbgAutoClearShell)
- self._write(' <TracePython value="%s" />' % \
- self.project.dbgTracePython)
- self._write(' <AutoContinue value="%s" />' % \
- self.project.dbgAutoContinue)
+ self._write(' <AutoClearShell value="{0}" />'.format(
+ self.project.dbgAutoClearShell))
+ self._write(' <TracePython value="{0}" />'.format(
+ self.project.dbgTracePython))
+ self._write(' <AutoContinue value="{0}" />'.format(
+ self.project.dbgAutoContinue))
self._write(" <CovexcPattern></CovexcPattern>") # kept for compatibility
self._write(" </DebugInfo>")
@@ -195,8 +199,8 @@
editor = self.vm.getOpenEditor(of)
for bookmark in editor.getBookmarks():
self._write(" <Bookmark>")
- self._write(" <BmFilename>%s</BmFilename>" % of)
- self._write(' <Linenumber value="%d" />' % bookmark)
+ self._write(" <BmFilename>{0}</BmFilename>".format(of))
+ self._write(' <Linenumber value="{0:d}" />'.format(bookmark))
self._write(" </Bookmark>")
self._write(" </Bookmarks>")
