diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-23 08:46:34 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-03-23 10:02:37 +0100 |
commit | 401d8c212b1d394b05cfd7f5db05062a07604150 (patch) | |
tree | 8e5645e8ec5e8f1464d880f68859264ba9c439ec | |
parent | 570cc14c50782ed46393a0a6a8d9d491fbb3785a (diff) |
Replace .format() in examples by f-strings
As a drive by, fix the chartthemes example to work.
Task-number: PYSIDE-1112
Change-Id: I35deeba69f2db2c8c0848cce7316fb621b1b5818
Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
-rw-r--r-- | examples/charts/callout/callout.py | 5 | ||||
-rw-r--r-- | examples/charts/chartthemes/main.py | 122 | ||||
-rw-r--r-- | examples/charts/donutbreakdown/donutbreakdown.py | 10 | ||||
-rw-r--r-- | examples/charts/memoryusage/memoryusage.py | 7 | ||||
-rw-r--r-- | examples/charts/modeldata/modeldata.py | 10 | ||||
-rw-r--r-- | examples/corelib/settingseditor/settingseditor.py | 29 | ||||
-rw-r--r-- | examples/opengl/contextinfo/contextinfo.py | 19 | ||||
-rw-r--r-- | examples/uitools/uiloader/uiloader.py | 3 | ||||
-rw-r--r-- | examples/utils/pyside_config.py | 26 | ||||
-rw-r--r-- | examples/widgets/gallery/widgetgallery.py | 5 | ||||
-rw-r--r-- | examples/widgets/itemviews/addressbook/addresswidget.py | 2 |
11 files changed, 130 insertions, 108 deletions
diff --git a/examples/charts/callout/callout.py b/examples/charts/callout/callout.py index 4a34e07f1..a5751a4b5 100644 --- a/examples/charts/callout/callout.py +++ b/examples/charts/callout/callout.py @@ -241,8 +241,9 @@ class View(QGraphicsView): self._tooltip = Callout(self._chart) if state: - self._tooltip.setText("X: {0:.2f} \nY: {1:.2f} " - .format(point.x(),point.y())) + x = point.x() + y = point.y() + self._tooltip.setText(f"X: {x:.2f} \nY: {y:.2f} ") self._tooltip.setAnchor(point) self._tooltip.setZValue(11) self._tooltip.updateGeometry() diff --git a/examples/charts/chartthemes/main.py b/examples/charts/chartthemes/main.py index 423806490..63808a607 100644 --- a/examples/charts/chartthemes/main.py +++ b/examples/charts/chartthemes/main.py @@ -45,7 +45,9 @@ from PySide6.QtCore import QPointF, Qt from PySide6.QtGui import QColor, QPainter, QPalette from PySide6.QtWidgets import (QApplication, QMainWindow, QSizePolicy, QWidget) -from PySide6.QtCharts import QtCharts +from PySide6.QtCharts import (QAreaSeries, QBarSet, QChart, QChartView, + QLineSeries, QPieSeries, QScatterSeries, + QSplineSeries, QStackedBarSeries) from ui_themewidget import Ui_ThemeWidgetForm as ui @@ -69,34 +71,34 @@ class ThemeWidget(QWidget): self.populate_legendbox() # Area Chart - chart_view = QtCharts.QChartView(self.create_areachart()) + chart_view = QChartView(self.create_areachart()) self.ui.gridLayout.addWidget(chart_view, 1, 0) self.charts.append(chart_view) # Pie Chart - chart_view = QtCharts.QChartView(self.createPieChart()) + chart_view = QChartView(self.createPieChart()) chart_view.setSizePolicy(QSizePolicy.Ignored, QSizePolicy.Ignored) self.ui.gridLayout.addWidget(chart_view, 1, 1) self.charts.append(chart_view) # Line Chart - chart_view = QtCharts.QChartView(self.createLineChart()) + chart_view = QChartView(self.createLineChart()) self.ui.gridLayout.addWidget(chart_view, 1, 2) self.charts.append(chart_view) # Bar Chart - chart_view = QtCharts.QChartView(self.createBarChart()) + chart_view = QChartView(self.createBarChart()) self.ui.gridLayout.addWidget(chart_view, 2, 0) self.charts.append(chart_view) # Spline Chart - chart_view = QtCharts.QChartView(self.createSplineChart()) + chart_view = QChartView(self.createSplineChart()) self.ui.gridLayout.addWidget(chart_view, 2, 1) self.charts.append(chart_view) # Scatter Chart - chart_view = QtCharts.QChartView(self.create_scatterchart()) + chart_view = QChartView(self.create_scatterchart()) self.ui.gridLayout.addWidget(chart_view, 2, 2) self.charts.append(chart_view) @@ -122,7 +124,7 @@ class ThemeWidget(QWidget): y_value += uniform(0, constant) x_value = (j + random()) * constant value = QPointF(x_value, y_value) - label = "Slice {}: {}".format(i, j) + label = f"Slice {i}: {j}" data_list.append((value, label)) data_table.append(data_list) @@ -131,22 +133,22 @@ class ThemeWidget(QWidget): def populate_themebox(self): theme = self.ui.themeComboBox - theme.addItem("Light", QtCharts.QChart.ChartThemeLight) - theme.addItem("Blue Cerulean", QtCharts.QChart.ChartThemeBlueCerulean) - theme.addItem("Dark", QtCharts.QChart.ChartThemeDark) - theme.addItem("Brown Sand", QtCharts.QChart.ChartThemeBrownSand) - theme.addItem("Blue NCS", QtCharts.QChart.ChartThemeBlueNcs) - theme.addItem("High Contrast", QtCharts.QChart.ChartThemeHighContrast) - theme.addItem("Blue Icy", QtCharts.QChart.ChartThemeBlueIcy) - theme.addItem("Qt", QtCharts.QChart.ChartThemeQt) + theme.addItem("Light", QChart.ChartThemeLight) + theme.addItem("Blue Cerulean", QChart.ChartThemeBlueCerulean) + theme.addItem("Dark", QChart.ChartThemeDark) + theme.addItem("Brown Sand", QChart.ChartThemeBrownSand) + theme.addItem("Blue NCS", QChart.ChartThemeBlueNcs) + theme.addItem("High Contrast", QChart.ChartThemeHighContrast) + theme.addItem("Blue Icy", QChart.ChartThemeBlueIcy) + theme.addItem("Qt", QChart.ChartThemeQt) def populate_animationbox(self): animated = self.ui.animatedComboBox - animated.addItem("No Animations", QtCharts.QChart.NoAnimation) - animated.addItem("GridAxis Animations", QtCharts.QChart.GridAxisAnimations) - animated.addItem("Series Animations", QtCharts.QChart.SeriesAnimations) - animated.addItem("All Animations", QtCharts.QChart.AllAnimations) + animated.addItem("No Animations", QChart.NoAnimation) + animated.addItem("GridAxis Animations", QChart.GridAxisAnimations) + animated.addItem("Series Animations", QChart.SeriesAnimations) + animated.addItem("All Animations", QChart.AllAnimations) def populate_legendbox(self): legend = self.ui.legendComboBox @@ -158,14 +160,14 @@ class ThemeWidget(QWidget): legend.addItem("Legend Right", Qt.AlignRight) def create_areachart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Area Chart") # The lower series initialized to zero values lower_series = None name = "Series " for i in range(len(self.data_table)): - upper_series = QtCharts.QLineSeries(chart) + upper_series = QLineSeries(chart) for j in range(len(self.data_table[i])): data = self.data_table[i][j] if lower_series: @@ -174,8 +176,8 @@ class ThemeWidget(QWidget): upper_series.append(QPointF(j, y_value)) else: upper_series.append(QPointF(j, data[0].y())) - area = QtCharts.QAreaSeries(upper_series, lower_series) - area.setName("{}{}".format(name, i)) + area = QAreaSeries(upper_series, lower_series) + area.setName(f"{name}{i}") chart.addSeries(area) lower_series = upper_series @@ -188,12 +190,12 @@ class ThemeWidget(QWidget): return chart def createBarChart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Bar chart") - series = QtCharts.QStackedBarSeries(chart) + series = QStackedBarSeries(chart) for i in range(len(self.data_table)): - barset = QtCharts.QBarSet("Bar set {}".format(i)) + barset = QBarSet(f"Bar set {i}") for data in self.data_table[i]: barset.append(data[0].y()) series.append(barset) @@ -208,15 +210,15 @@ class ThemeWidget(QWidget): return chart def createLineChart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Line chart") name = "Series " for i, lst in enumerate(self.data_table): - series = QtCharts.QLineSeries(chart) + series = QLineSeries(chart) for data in lst: series.append(data[0]) - series.setName("{}{}".format(name, i)) + series.setName(f"{name}{i}") chart.addSeries(series) chart.createDefaultAxes() @@ -228,10 +230,10 @@ class ThemeWidget(QWidget): return chart def createPieChart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Pie chart") - series = QtCharts.QPieSeries(chart) + series = QPieSeries(chart) for data in self.data_table[0]: slc = series.append(data[1], data[0].y()) if data == self.data_table[0][0]: @@ -246,14 +248,14 @@ class ThemeWidget(QWidget): return chart def createSplineChart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Spline chart") name = "Series " for i, lst in enumerate(self.data_table): - series = QtCharts.QSplineSeries(chart) + series = QSplineSeries(chart) for data in lst: series.append(data[0]) - series.setName("{}{}".format(name, i)) + series.setName(f"{name}{i}") chart.addSeries(series) chart.createDefaultAxes() @@ -265,14 +267,14 @@ class ThemeWidget(QWidget): return chart def create_scatterchart(self): - chart = QtCharts.QChart() + chart = QChart() chart.setTitle("Scatter chart") name = "Series " for i, lst in enumerate(self.data_table): - series = QtCharts.QScatterSeries(chart) + series = QScatterSeries(chart) for data in lst: series.append(data[0]) - series.setName("{}{}".format(name, i)) + series.setName(f"{name}{i}") chart.addSeries(series) chart.createDefaultAxes() @@ -298,40 +300,40 @@ class ThemeWidget(QWidget): if chart_theme != theme: for chart_view in self.charts: if theme == 0: - theme_name = QtCharts.QChart.ChartThemeLight + theme_name = QChart.ChartThemeLight elif theme == 1: - theme_name = QtCharts.QChart.ChartThemeBlueCerulean + theme_name = QChart.ChartThemeBlueCerulean elif theme == 2: - theme_name = QtCharts.QChart.ChartThemeDark + theme_name = QChart.ChartThemeDark elif theme == 3: - theme_name = QtCharts.QChart.ChartThemeBrownSand + theme_name = QChart.ChartThemeBrownSand elif theme == 4: - theme_name = QtCharts.QChart.ChartThemeBlueNcs + theme_name = QChart.ChartThemeBlueNcs elif theme == 5: - theme_name = QtCharts.QChart.ChartThemeHighContrast + theme_name = QChart.ChartThemeHighContrast elif theme == 6: - theme_name = QtCharts.QChart.ChartThemeBlueIcy + theme_name = QChart.ChartThemeBlueIcy elif theme == 7: - theme_name = QtCharts.QChart.ChartThemeQt + theme_name = QChart.ChartThemeQt else: - theme_name = QtCharts.QChart.ChartThemeLight + theme_name = QChart.ChartThemeLight chart_view.chart().setTheme(theme_name) # Set palette colors based on selected theme - if theme == QtCharts.QChart.ChartThemeLight: + if theme == QChart.ChartThemeLight: set_colors(QColor(0xf0f0f0), QColor(0x404044)) - elif theme == QtCharts.QChart.ChartThemeDark: + elif theme == QChart.ChartThemeDark: set_colors(QColor(0x121218), QColor(0xd6d6d6)) - elif theme == QtCharts.QChart.ChartThemeBlueCerulean: + elif theme == QChart.ChartThemeBlueCerulean: set_colors(QColor(0x40434a), QColor(0xd6d6d6)) - elif theme == QtCharts.QChart.ChartThemeBrownSand: + elif theme == QChart.ChartThemeBrownSand: set_colors(QColor(0x9e8965), QColor(0x404044)) - elif theme == QtCharts.QChart.ChartThemeBlueNcs: + elif theme == QChart.ChartThemeBlueNcs: set_colors(QColor(0x018bba), QColor(0x404044)) - elif theme == QtCharts.QChart.ChartThemeHighContrast: + elif theme == QChart.ChartThemeHighContrast: set_colors(QColor(0xffab03), QColor(0x181818)) - elif theme == QtCharts.QChart.ChartThemeBlueIcy: + elif theme == QChart.ChartThemeBlueIcy: set_colors(QColor(0xcee7f0), QColor(0x404044)) else: set_colors(QColor(0xf0f0f0), QColor(0x404044)) @@ -351,15 +353,15 @@ class ThemeWidget(QWidget): animation_options = chart.animationOptions() if animation_options != options: for chart_view in self.charts: - options_name = QtCharts.QChart.NoAnimation + options_name = QChart.NoAnimation if options == 0: - options_name = QtCharts.QChart.NoAnimation + options_name = QChart.NoAnimation elif options == 1: - options_name = QtCharts.QChart.GridAxisAnimations + options_name = QChart.GridAxisAnimations elif options == 2: - options_name = QtCharts.QChart.SeriesAnimations + options_name = QChart.SeriesAnimations elif options == 3: - options_name = QtCharts.QChart.AllAnimations + options_name = QChart.AllAnimations chart_view.chart().setAnimationOptions(options_name) # Update legend alignment @@ -389,7 +391,7 @@ if __name__ == "__main__": window = QMainWindow() widget = ThemeWidget(None) window.setCentralWidget(widget) - available_geometry = app.desktop().availableGeometry(window) + available_geometry = window.screen().availableGeometry() size = available_geometry.height() * 0.75 window.setFixedSize(size, size * 0.8) window.show() diff --git a/examples/charts/donutbreakdown/donutbreakdown.py b/examples/charts/donutbreakdown/donutbreakdown.py index 4c319c84f..51b0956ca 100644 --- a/examples/charts/donutbreakdown/donutbreakdown.py +++ b/examples/charts/donutbreakdown/donutbreakdown.py @@ -66,8 +66,8 @@ class MainSlice(QPieSlice): return self.name def update_label(self): - self.setLabel("{} {:.2f}%".format(self.name, - self.percentage() * 100)) + p = self.percentage() * 100 + self.setLabel(f"{self.name} {p:.2f}%") class DonutBreakdownChart(QChart): @@ -132,9 +132,9 @@ class DonutBreakdownChart(QChart): marker.setVisible(False) else: # modify markers from breakdown series - marker.setLabel("{} {:.2f}%".format( - marker.slice().label(), - marker.slice().percentage() * 100, 0)) + label = marker.slice().label() + p = marker.slice().percentage() * 100 + marker.setLabel(f"{label} {p:.2f}%") marker.setFont(QFont("Arial", 8)) if __name__ == "__main__": diff --git a/examples/charts/memoryusage/memoryusage.py b/examples/charts/memoryusage/memoryusage.py index a6c536de5..032e79541 100644 --- a/examples/charts/memoryusage/memoryusage.py +++ b/examples/charts/memoryusage/memoryusage.py @@ -67,9 +67,10 @@ def getMemoryUsage(): memoryUsage = float(line[64:74].strip().replace(',', '').replace('.', '')) legend = '' if memoryUsage > 10240: - legend = '{} {}M'.format(command, round(memoryUsage / 1024)) + mb = memoryUsage / 1024 + legend = f'{command} {mb}M' else: - legend = '{} {}K'.format(command, round(memoryUsage)) + legend = f'{command} {memoryUsage}K' result.append([legend, memoryUsage]) else: # Unix: Obtain memory usage percentage from 'ps' @@ -87,7 +88,7 @@ def getMemoryUsage(): if not command.startswith('['): command = os.path.basename(command) memoryUsage = round(float(tokens[memoryColumn].replace(',', '.'))) - legend = '{} {}%'.format(command, memoryUsage) + legend = f'{command} {memoryUsage}%' result.append([legend, memoryUsage]) result.sort(key = lambda x: x[1], reverse=True) diff --git a/examples/charts/modeldata/modeldata.py b/examples/charts/modeldata/modeldata.py index 1d10190f4..380f538f1 100644 --- a/examples/charts/modeldata/modeldata.py +++ b/examples/charts/modeldata/modeldata.py @@ -84,7 +84,7 @@ class CustomTableModel(QAbstractTableModel): else: return "y" else: - return "{}".format(section + 1) + return str(section + 1) def data(self, index, role=Qt.DisplayRole): if role == Qt.DisplayRole: @@ -144,8 +144,8 @@ class TableWidget(QWidget): seriesColorHex = "#000000" # get the color of the series and use it for showing the mapped area - seriesColorHex = "{}".format(self.series.pen().color().name()) - self.model.add_mapping(seriesColorHex, QRect(0, 0, 2, self.model.rowCount())) + self.model.add_mapping(self.series.pen().color().name(), + QRect(0, 0, 2, self.model.rowCount())) # series 2 self.series = QLineSeries() @@ -159,8 +159,8 @@ class TableWidget(QWidget): self.chart.addSeries(self.series) # get the color of the series and use it for showing the mapped area - seriesColorHex = "{}".format(self.series.pen().color().name()) - self.model.add_mapping(seriesColorHex, QRect(2, 0, 2, self.model.rowCount())) + self.model.add_mapping(self.series.pen().color().name(), + QRect(2, 0, 2, self.model.rowCount())) self.chart.createDefaultAxes() self.chart_view = QChartView(self.chart) diff --git a/examples/corelib/settingseditor/settingseditor.py b/examples/corelib/settingseditor/settingseditor.py index 9e2a2a2d8..8554be637 100644 --- a/examples/corelib/settingseditor/settingseditor.py +++ b/examples/corelib/settingseditor/settingseditor.py @@ -87,14 +87,14 @@ class TypeChecker: self.size_exp = QRegularExpression(self.point_exp) date_pattern = '([0-9]{,4})-([0-9]{,2})-([0-9]{,2})' - self.date_exp = QRegularExpression('^{}$'.format(date_pattern)) + self.date_exp = QRegularExpression(f'^{date_pattern}$') assert self.date_exp.isValid() time_pattern = '([0-9]{,2}):([0-9]{,2}):([0-9]{,2})' - self.time_exp = QRegularExpression('^{}$'.format(time_pattern)) + self.time_exp = QRegularExpression(f'^{time_pattern}$') assert self.time_exp.isValid() - pattern = '^{}T{}$'.format(date_pattern, time_pattern) + pattern = f'^{date_pattern}T{time_pattern}$' self.dateTime_exp = QRegularExpression(pattern) assert self.dateTime_exp.isValid() @@ -315,7 +315,7 @@ class MainWindow(QMainWindow): if not settings.isWritable(): nice_name += " (read only)" - self.setWindowTitle("{} - Settings Editor".format(nice_name)) + self.setWindowTitle(f"{nice_name} - Settings Editor") class LocationDialog(QDialog): @@ -752,23 +752,30 @@ class VariantDelegate(QItemDelegate): if isinstance(value, (int, float, QByteArray)): return str(value) if isinstance(value, QColor): - return '({},{},{},{})'.format(value.red(), value.green(), - value.blue(), value.alpha()) + (r, g, b, a) = (value.red(), value.green(), value.blue(), value.alpha()) + return f'({r},{g},{b},{a})' if isinstance(value, (QDate, QDateTime, QTime)): return value.toString(Qt.ISODate) if isinstance(value, QPoint): - return '({},{})'.format(value.x(), value.y()) + x = value.x() + y = value.y() + return f'({x},{y})' if isinstance(value, QRect): - return '({},{},{},{})'.format(value.x(), value.y(), value.width(), - value.height()) + x = value.x() + y = value.y() + w = value.width() + h = value.height() + return f'({x},{y},{w},{h})' if isinstance(value, QSize): - return '({},{})'.format(value.width(), value.height()) + w = value.width() + h = value.height() + return f'({w},{h})' if isinstance(value, list): return ','.join(value) if value is None: return '<Invalid>' - return '<{}>'.format(value) + return f'<{value}>' if __name__ == '__main__': diff --git a/examples/opengl/contextinfo/contextinfo.py b/examples/opengl/contextinfo/contextinfo.py index 0a686d388..dae848ded 100644 --- a/examples/opengl/contextinfo/contextinfo.py +++ b/examples/opengl/contextinfo/contextinfo.py @@ -112,8 +112,9 @@ colors = numpy.array([1, 0, 0, 0, 1, 0, 0, 0, 1], dtype = numpy.float32) def print_surface_format(surface_format): profile_name = 'core' if surface_format.profile() == QSurfaceFormat.CoreProfile else 'compatibility' - return "{} version {}.{}".format(profile_name, - surface_format.majorVersion(), surface_format.minorVersion()) + major = surface_format.majorVersion() + minor = surface_format.minorVersion() + return f"{profile_name} version {major}.{minor}" class RenderWindow(QWindow): def __init__(self, format): @@ -145,11 +146,14 @@ class RenderWindow(QWindow): vertexShader = vertexShaderSource if useNewStyleShader else vertexShaderSource110 fragmentShader = fragmentShaderSource if useNewStyleShader else fragmentShaderSource110 if not self.program.addShaderFromSourceCode(QOpenGLShader.Vertex, vertexShader): - raise Exception("Vertex shader could not be added: {} ({})".format(self.program.log(), vertexShader)) + log = self.program.log() + raise Exception("Vertex shader could not be added: {log} ({vertexShader})") if not self.program.addShaderFromSourceCode(QOpenGLShader.Fragment, fragmentShader): - raise Exception("Fragment shader could not be added: {} ({})".format(self.program.log(), fragmentShader)) + log = self.program.log() + raise Exception(f"Fragment shader could not be added: {log} ({fragmentShader})") if not self.program.link(): - raise Exception("Could not link shaders: {}".format(self.program.log())) + log = self.program.log() + raise Exception(f"Could not link shaders: {log}") self.posAttr = self.program.attributeLocation("posAttr") self.colAttr = self.program.attributeLocation("colAttr") @@ -257,8 +261,9 @@ class MainWindow(QWidget): hBoxLayout.addWidget(container) def updateDescription(self): - text = "{}\n\nPython {}\n\n{}".format(QLibraryInfo.build(), sys.version, - self.renderWindow.glInfo()) + build = QLibraryInfo.build() + gl = self.renderWindow.glInfo() + text = f"{build}\n\nPython {sys.version}\n\n{gl}" self.plainTextEdit.setPlainText(text) if __name__ == '__main__': diff --git a/examples/uitools/uiloader/uiloader.py b/examples/uitools/uiloader/uiloader.py index 21b126bb2..e214cf87d 100644 --- a/examples/uitools/uiloader/uiloader.py +++ b/examples/uitools/uiloader/uiloader.py @@ -59,7 +59,8 @@ if __name__ == '__main__': app = QApplication(sys.argv) ui_file = QFile(ui_file_name) if not ui_file.open(QIODevice.ReadOnly): - print("Cannot open {}: {}".format(ui_file_name, ui_file.errorString())) + reason = ui_file.errorString() + print(f"Cannot open {ui_file_name}: {reason}") sys.exit(-1) loader = QUiLoader() widget = loader.load(ui_file, None) diff --git a/examples/utils/pyside_config.py b/examples/utils/pyside_config.py index 6382185c5..523879c12 100644 --- a/examples/utils/pyside_config.py +++ b/examples/utils/pyside_config.py @@ -122,7 +122,7 @@ options.append(("--pyside-shared-libraries-cmake", options_usage = '' for i, (flag, _, _, description) in enumerate(options): - options_usage += ' {:<45} {}'.format(flag, description) + options_usage += f' {flag:<45} {description}' if i < len(options) - 1: options_usage += '\n' @@ -250,20 +250,24 @@ def python_link_flags_qmake(): for d in libdir.split("\\"): if " " in d: libdir = libdir.replace(d, d.split(" ")[0][:-1]+"~1") - return '-L{} -l{}'.format(libdir, flags['lib']) + lib_flags = flags['lib'] + return f'-L{libdir} -l{lib_flags}' elif sys.platform == 'darwin': - return '-L{} -l{}'.format(flags['libdir'], flags['lib']) - + libdir = flags['libdir'] + lib_flags = flags['lib'] + return f'-L{libdir} -l{lib_flags}' else: # Linux and anything else - return '-L{} -l{}'.format(flags['libdir'], flags['lib']) + libdir = flags['libdir'] + lib_flags = flags['lib'] + return f'-L{libdir} -l{lib_flags}' def python_link_flags_cmake(): flags = python_link_data() libdir = flags['libdir'] lib = re.sub(r'.dll$', '.lib', flags['lib']) - return '{};{}'.format(libdir, lib) + return f'{libdir};{lib}' def python_link_data(): @@ -279,14 +283,14 @@ def python_link_data(): flags['libdir'] = libdir if sys.platform == 'win32': suffix = '_d' if is_debug() else '' - flags['lib'] = 'python{}{}'.format(version_no_dots, suffix) + flags['lib'] = f'python{version_no_dots}{suffix}' elif sys.platform == 'darwin': - flags['lib'] = 'python{}'.format(version) + flags['lib'] = f'python{version}' # Linux and anything else else: - flags['lib'] = 'python{}{}'.format(version, sys.abiflags) + flags['lib'] = f'python{version}{sys.abiflags}' return flags @@ -306,7 +310,7 @@ def get_package_qmake_lflags(which_package): if package_path is None: return None - link = "-L{}".format(package_path) + link = f"-L{package_path}" glob_result = glob.glob(os.path.join(package_path, shared_library_glob_pattern())) for lib in filter_shared_libraries(glob_result): link += ' ' @@ -367,5 +371,5 @@ for argument, handler, error, _ in options: line = handler_result if print_all: - line = "{:<40}: ".format(argument) + line + line = f"{argument:<40}: {line}" print(line) diff --git a/examples/widgets/gallery/widgetgallery.py b/examples/widgets/gallery/widgetgallery.py index 3ea21888e..fe70dba52 100644 --- a/examples/widgets/gallery/widgetgallery.py +++ b/examples/widgets/gallery/widgetgallery.py @@ -75,7 +75,7 @@ def class_name(o): def help_url(page): """Build a Qt help URL from the page name""" major_version = qVersion().split('.')[0] - return "https://doc.qt.io/qt-{}/{}.html".format(major_version, page) + return f"https://doc.qt.io/qt-{major_version}/{page}.html" def launch_help(widget): @@ -204,7 +204,8 @@ class WidgetGallery(QDialog): main_layout.addWidget(self._progress_bar, 3, 0, 1, 2) main_layout.addWidget(dialog_buttonbox, 4, 0, 1, 2) - self.setWindowTitle("Widget Gallery Qt {}".format(qVersion())) + qv = qVersion() + self.setWindowTitle(f"Widget Gallery Qt {qv}") def setVisible(self, visible): super(WidgetGallery, self).setVisible(visible) diff --git a/examples/widgets/itemviews/addressbook/addresswidget.py b/examples/widgets/itemviews/addressbook/addresswidget.py index dfb0e42e5..b90ba31ac 100644 --- a/examples/widgets/itemviews/addressbook/addresswidget.py +++ b/examples/widgets/itemviews/addressbook/addresswidget.py @@ -194,7 +194,7 @@ class AddressWidget(QTabWidget): # tab. The regex will end up looking like "^[ABC].*", only # allowing this tab to display items where the name starts with # "A", "B", or "C". Notice that we set it to be case-insensitive. - re = QRegularExpression("^[{}].*".format(group)) + re = QRegularExpression(f"^[{group}].*") assert re.isValid() re.setPatternOptions(QRegularExpression.CaseInsensitiveOption) proxyModel.setFilterRegularExpression(re) |