diff options
Diffstat (limited to 'examples/webenginewidgets')
4 files changed, 19 insertions, 18 deletions
diff --git a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py index 8689c9d3f..5310a46f0 100644 --- a/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/bookmarkwidget.py @@ -64,8 +64,8 @@ _default_bookmarks = [ def _config_dir(): - return '{}/QtForPythonBrowser'.format( - QStandardPaths.writableLocation(QStandardPaths.ConfigLocation)) + location = QStandardPaths.writableLocation(QStandardPaths.ConfigLocation) + return f'{location}/QtForPythonBrowser' _bookmark_file = 'bookmarks.json' @@ -118,9 +118,8 @@ def _serialize_model(model, directory): if not icon.isNull(): icon_sizes = icon.availableSizes() largest_size = icon_sizes[len(icon_sizes) - 1] - icon_file_name = '{}/icon{:02}_{:02}_{}.png'.format(directory, - f, i, - largest_size.width()) + w = largest_size.width() + icon_file_name = f'{directory}/icon{f:02}_{i:02}_{w}.png' icon.pixmap(largest_size).save(icon_file_name, 'PNG') entry.append(icon_file_name) result.append(entry) @@ -235,7 +234,7 @@ class BookmarkWidget(QTreeView): self._remove_item(current_item) def _remove_item(self, item): - message = "Would you like to remove \"{}\"?".format(item.text()) + message = f"Would you like to remove \"{item.text()}\"?" button = QMessageBox.question(self, "Remove", message, QMessageBox.Yes | QMessageBox.No) if button == QMessageBox.Yes: @@ -248,14 +247,14 @@ class BookmarkWidget(QTreeView): native_dir_path = QDir.toNativeSeparators(dir_path) dir = QFileInfo(dir_path) if not dir.isDir(): - print('Creating {}...'.format(native_dir_path)) + print(f'Creating {native_dir_path}...') if not QDir(dir.absolutePath()).mkpath(dir.fileName()): - warnings.warn('Cannot create {}.'.format(native_dir_path), + warnings.warn(f'Cannot create {native_dir_path}.', RuntimeWarning) return serialized_model = _serialize_model(self._model, dir_path) bookmark_file_name = os.path.join(native_dir_path, _bookmark_file) - print('Writing {}...'.format(bookmark_file_name)) + print(f'Writing {bookmark_file_name}...') with open(bookmark_file_name, 'w') as bookmark_file: json.dump(serialized_model, bookmark_file, indent=4) @@ -263,7 +262,7 @@ class BookmarkWidget(QTreeView): bookmark_file_name = os.path.join(QDir.toNativeSeparators(_config_dir()), _bookmark_file) if os.path.exists(bookmark_file_name): - print('Reading {}...'.format(bookmark_file_name)) + print(f'Reading {bookmark_file_name}...') return json.load(open(bookmark_file_name)) return _default_bookmarks diff --git a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py index b95ccee45..397302ac1 100644 --- a/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/browsertabwidget.py @@ -79,7 +79,7 @@ class BrowserTabWidget(QTabWidget): self._window_factory_function) index = self.count() self._webengineviews.append(web_engine_view) - title = 'Tab {}'.format(index + 1) + title = f'Tab {index + 1}' self.addTab(web_engine_view, title) page = web_engine_view.page() page.titleChanged.connect(self._title_changed) diff --git a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py index 5319d66fc..17ebd583d 100644 --- a/examples/webenginewidgets/tabbedbrowser/downloadwidget.py +++ b/examples/webenginewidgets/tabbedbrowser/downloadwidget.py @@ -64,9 +64,10 @@ class DownloadWidget(QProgressBar): description = QFileInfo(path).fileName() description_length = len(description) if description_length > 30: - description = '{}...{}'.format(description[0:10], - description[description_length - 10:]) - self.setFormat('{} %p%'.format(description)) + description_ini = description[0:10] + description_end = description[description_length - 10:] + description = f'{description_ini}...{description_end}' + self.setFormat(f'{description} %p%') self.setOrientation(Qt.Horizontal) self.setMinimum(0) self.setValue(0) @@ -90,11 +91,12 @@ class DownloadWidget(QProgressBar): def _update_tool_tip(self): path = self._download_item.path() - tool_tip = "{}\n{}".format(self._download_item.url().toString(), - QDir.toNativeSeparators(path)) + url_str = self._download_item.url().toString() + native_sep = QDir.toNativeSeparators(path) + tool_tip = f"{url_str}\n{native_sep}" total_bytes = self._download_item.totalBytes() if total_bytes > 0: - tool_tip += "\n{}K".format(total_bytes / 1024) + tool_tip += f"\n{total_bytes / 1024}K" state = self.state() if state == QWebEngineDownloadItem.DownloadRequested: tool_tip += "\n(requested)" diff --git a/examples/webenginewidgets/tabbedbrowser/main.py b/examples/webenginewidgets/tabbedbrowser/main.py index b1ca4983b..f2280c273 100644 --- a/examples/webenginewidgets/tabbedbrowser/main.py +++ b/examples/webenginewidgets/tabbedbrowser/main.py @@ -348,7 +348,7 @@ class MainWindow(QMainWindow): def _update_zoom_label(self): percent = int(self._tab_widget.zoom_factor() * 100) - self._zoom_label.setText("{}%".format(percent)) + self._zoom_label.setText(f"{percent}%") def _download_requested(self, item): # Remove old downloads before opening a new one |