Mercurial Repositories > eric / changeset
changeset
Did some more string format conversions.
Tue, 27 Jul 2010 12:44:19 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 27 Jul 2010 12:44:19 +0200
- changeset 414
- 8c91e942d2da
- parent 413
- 3d82e6eb3516
- child 415
- 59a0f9e90768
Did some more string format conversions.
--- a/Helpviewer/AdBlock/AdBlockManager.py Tue Jul 27 12:33:08 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockManager.py Tue Jul 27 12:44:19 2010 +0200 @@ -116,8 +116,8 @@ """ location = self.__customSubscriptionLocation() encodedUrl = bytes(location.toEncoded()).decode() - url = QUrl("abp:subscribe?location=%s&title=%s" % \ - (encodedUrl, self.trUtf8("Custom Rules"))) + url = QUrl("abp:subscribe?location={0}&title={1}".format( + encodedUrl, self.trUtf8("Custom Rules"))) return url def customRules(self):
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Tue Jul 27 12:33:08 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Tue Jul 27 12:44:19 2010 +0200 @@ -185,7 +185,7 @@ dataDir = os.path.join(Utilities.getConfigDir(), "browser", "subscriptions") if not os.path.exists(dataDir): os.makedirs(dataDir) - fileName = os.path.join(dataDir, "adblock_subscription_%s" % sha1) + fileName = os.path.join(dataDir, "adblock_subscription_{0}".format(sha1)) return fileName def __loadRules(self):
--- a/Helpviewer/DownloadDialog.py Tue Jul 27 12:33:08 2010 +0200 +++ b/Helpviewer/DownloadDialog.py Tue Jul 27 12:44:19 2010 +0200 @@ -197,7 +197,7 @@ i = 1 while QFile.exists(name): # file exists already, don't overwrite - name = directory + baseName + ('-%d' % i) + name = directory + baseName + ('-{0:d}'.format(i)) if endName: name += '.' + endName i += 1
--- a/Helpviewer/Passwords/PasswordManager.py Tue Jul 27 12:33:08 2010 +0200 +++ b/Helpviewer/Passwords/PasswordManager.py Tue Jul 27 12:44:19 2010 +0200 @@ -64,11 +64,11 @@ @param f file or file like object open for writing @return flag indicating success (booelan) """ - f.write("%s\n" % self.url.toString()) - f.write("%s\n" % self.name) - f.write("%s\n" % self.hasAPassword) + f.write("{0}\n".format(self.url.toString())) + f.write("{0}\n".format(self.name)) + f.write("{0}\n".format(self.hasAPassword)) for element in self.elements: - f.write("%s = %s\n" % (element[0], element[1])) + f.write("{0} = {1}\n".format(element[0], element[1])) class PasswordManager(QObject): """ @@ -153,9 +153,9 @@ @return key string (string) """ if realm: - key = "%s://%s (%s)" % (url.scheme(), url.authority(), realm) + key = "{0}://{1} ({2})".format(url.scheme(), url.authority(), realm) else: - key = "%s://%s" % (url.scheme(), url.authority()) + key = "{0}://{1}".format(url.scheme(), url.authority()) return key def save(self): @@ -169,20 +169,20 @@ try: f = open(loginFile, "w", encoding = "utf-8") for key, login in list(self.__logins.items()): - f.write("%s\n" % key) - f.write("%s\n" % login[0]) - f.write("%s\n" % login[1]) - f.write("%s\n" % self.SEPARATOR) + f.write("{0}\n".format(key)) + f.write("{0}\n".format(login[0])) + f.write("{0}\n".format(login[1])) + f.write("{0}\n".format(self.SEPARATOR)) if self.__loginForms: - f.write("%s\n" % self.FORMS) + f.write("{0}\n".format(self.FORMS)) for key, form in list(self.__loginForms.items()): - f.write("%s\n" % key) + f.write("{0}\n".format(key)) form.save(f) - f.write("%s\n" % self.SEPARATOR) + f.write("{0}\n".format(self.SEPARATOR)) if self.__never: - f.write("%s\n" % self.NEVER) + f.write("{0}\n".format(self.NEVER)) for key in self.__never: - f.write("%s\n") % key + f.write("{0}\n".format(key)) f.close() except IOError as err: QMessageBox.critical(None, @@ -531,25 +531,25 @@ formName = "0" else: try: - formName = "%d" % int(form.name) + formName = "{0:d}".format(int(form.name)) except ValueError: - formName = '"%s"' % form.name + formName = '"{0}"'.format(form.name) for element in form.elements: name = element[0] value = element[1] disabled = page.mainFrame().evaluateJavaScript( - 'document.forms[%s].elements["%s"].disabled' % (formName, name)) + 'document.forms[{0}].elements["{1}"].disabled'.format(formName, name)) if disabled: continue readOnly = page.mainFrame().evaluateJavaScript( - 'document.forms[%s].elements["%s"].readOnly' % (formName, name)) + 'document.forms[{0}].elements["{1}"].readOnly'.format(formName, name)) if readOnly: continue type_ = page.mainFrame().evaluateJavaScript( - 'document.forms[%s].elements["%s"].type' % (formName, name)) + 'document.forms[{0}].elements["{1}"].type'.format(formName, name)) if type_ == "" or \ type_ in ["hidden", "reset", "submit"]: continue @@ -558,6 +558,6 @@ setType = type_ == "checkbox" and "checked" or "value" value = value.replace("\\", "\\\\") value = value.replace('"', '\\"') - javascript = 'document.forms[%s].elements["%s"].%s="%s";' % \ - (formName, name, setType, value) + javascript = 'document.forms[{0}].elements["{1}"].{2}="{3}";'.format( + formName, name, setType, value) page.mainFrame().evaluateJavaScript(javascript)
--- a/IconEditor/IconEditorPalette.py Tue Jul 27 12:33:08 2010 +0200 +++ b/IconEditor/IconEditorPalette.py Tue Jul 27 12:44:19 2010 +0200 @@ -98,7 +98,8 @@ self.__color.setPixmap(pm) self.__colorTxt.setText( - "%d, %d, %d, %d" % (color.red(), color.green(), color.blue(), color.alpha())) + "{0:d}, {1:d}, {2:d}, {3:d}".format( + color.red(), color.green(), color.blue(), color.alpha())) self.__colorAlpha.setValue(self.__currentAlpha)
--- a/IconEditor/IconEditorWindow.py Tue Jul 27 12:33:08 2010 +0200 +++ b/IconEditor/IconEditorWindow.py Tue Jul 27 12:44:19 2010 +0200 @@ -1177,7 +1177,7 @@ @param x x-coordinate (integer) @param y y-coordinate (integer) """ - self.__sbPos.setText("%d, %d" % (x + 1, y + 1)) + self.__sbPos.setText("{0:d}, {1:d}".format(x + 1, y + 1)) def __updateSize(self, w, h): """ @@ -1186,14 +1186,14 @@ @param w width of the icon (integer) @param h height of the icon (integer) """ - self.__sbSize.setText("%d x %d" % (w, h)) + self.__sbSize.setText("{0:d} x {1:d}".format(w, h)) def __updateZoom(self): """ Private slot to show the current zoom factor. """ zoom = self.__editor.zoomFactor() - self.__sbZoom.setText("%d %%" % (zoom * 100, )) + self.__sbZoom.setText("{0:d} %".format(zoom * 100)) self.zoomOutAct.setEnabled(self.__editor.zoomFactor() > 1) def __zoomIn(self):
--- a/MultiProject/MultiProject.py Tue Jul 27 12:33:08 2010 +0200 +++ b/MultiProject/MultiProject.py Tue Jul 27 12:44:19 2010 +0200 @@ -860,11 +860,11 @@ 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())
