diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-22 15:41:48 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-22 19:41:03 +0000 |
| commit | 570cc14c50782ed46393a0a6a8d9d491fbb3785a (patch) | |
| tree | 9b123ff862fb83b2c70db4791792919ecc59bd47 /examples/xml/dombookmarks | |
| parent | 80aec29aca246f1f67a4f8c453b49f1eadfee6fd (diff) | |
Replace % formatting in examples by f-strings
As drive-by, Fix fortune server, addressbook and dombookmarks examples to work.
Task-number: PYSIDE-1112
Change-Id: I8ef7759ed56aeb7157cf2222bee9b6481973112a
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'examples/xml/dombookmarks')
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/examples/xml/dombookmarks/dombookmarks.py b/examples/xml/dombookmarks/dombookmarks.py index 0a8d01ec4..91aaf78d4 100644 --- a/examples/xml/dombookmarks/dombookmarks.py +++ b/examples/xml/dombookmarks/dombookmarks.py @@ -70,8 +70,9 @@ class MainWindow(QtWidgets.QMainWindow): inFile = QtCore.QFile(fileName) if not inFile.open(QtCore.QFile.ReadOnly | QtCore.QFile.Text): + reason = inFile.errorString() QtWidgets.QMessageBox.warning(self, "DOM Bookmarks", - "Cannot read file %s:\n%s." % (fileName, inFile.errorString())) + f"Cannot read file {fileName}:\n{reason}.") return if self.xbelTree.read(inFile): @@ -87,8 +88,9 @@ class MainWindow(QtWidgets.QMainWindow): outFile = QtCore.QFile(fileName) if not outFile.open(QtCore.QFile.WriteOnly | QtCore.QFile.Text): + reason = outFile.errorString() QtWidgets.QMessageBox.warning(self, "DOM Bookmarks", - "Cannot write file %s:\n%s." % (fileName, outFile.errorString())) + "Cannot write file {fileName}:\n{reason}.") return if self.xbelTree.write(outFile): @@ -151,7 +153,7 @@ class XbelTree(QtWidgets.QTreeWidget): ok, errorStr, errorLine, errorColumn = self.domDocument.setContent(device, True) if not ok: QtWidgets.QMessageBox.information(self.window(), "DOM Bookmarks", - "Parse error at line %d, column %d:\n%s" % (errorLine, errorColumn, errorStr)) + f"Parse error at line {errorLine}, column {errorColumn}:\n{errorStr}") return False root = self.domDocument.documentElement() @@ -215,7 +217,7 @@ class XbelTree(QtWidgets.QTreeWidget): item.setText(0, title) folded = (element.attribute('folded') != 'no') - self.setItemExpanded(item, not folded) + item.setExpanded(not folded) child = element.firstChildElement() while not child.isNull(): |