Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit 800da5a

Browse filesBrowse files
authored
Merge pull request winpython#1169 from stonebig/master
modernize to f-string
2 parents 7354789 + b87a913 commit 800da5a
Copy full SHA for 800da5a

File tree

Expand file treeCollapse file tree

1 file changed

+20
-38
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+20
-38
lines changed

‎winpython/controlpanel.py

Copy file name to clipboardExpand all lines: winpython/controlpanel.py
+20-38Lines changed: 20 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ def setup_window(self):
687687
# Help menu
688688
about_action = create_action(
689689
self,
690-
"About %s..." % self.NAME,
690+
f"About {self.NAME}...",
691691
icon=get_std_icon('MessageBoxInformation'),
692692
triggered=self.about,
693693
)
@@ -706,7 +706,7 @@ def setup_window(self):
706706
status = self.statusBar()
707707
status.setObjectName("StatusBar")
708708
status.showMessage(
709-
"Welcome to %s!" % self.NAME, 5000
709+
f"Welcome to {self.NAME}!", 5000
710710
)
711711

712712
# Button layouts
@@ -823,8 +823,7 @@ def distribution_changed(self, path):
823823
self.untable.refresh_distribution(dist)
824824
self.distribution = dist
825825
self.selector.label.setText(
826-
'Python %s %dbit:'
827-
% (dist.version, dist.architecture)
826+
f'Python {dist.version} {dist.architecture}bit:'
828827
)
829828

830829
def add_packages(self):
@@ -887,8 +886,7 @@ def process_packages(self, action):
887886
for index, package in enumerate(packages):
888887
progress.setValue(index)
889888
progress.setLabelText(
890-
"%s %s %s..."
891-
% (text, package.name, package.version)
889+
f"{text} {package.name} {package.version}..."
892890
)
893891
QApplication.processEvents()
894892
if progress.wasCanceled():
@@ -915,9 +913,9 @@ def process_packages(self, action):
915913
QMessageBox.critical(
916914
self,
917915
"Error",
918-
"<b>Unable to %s <i>%s</i></b>"
919-
"<br><br>Error message:<br>%s"
920-
% (action, pstr, error),
916+
f"<b>Unable to {action} <i>{<pstr}/i></b>"
917+
f"<br><br>Error message:<br>{error}"
918+
,
921919
)
922920
progress.setValue(progress.maximum())
923921
status.clearMessage()
@@ -930,12 +928,12 @@ def process_packages(self, action):
930928

931929
def report_issue(self):
932930

933-
issue_template = """\
934-
Python distribution: %s
935-
Control panel version: %s
931+
issue_template = f"""\
932+
Python distribution: {python_distribution_infos()}
933+
Control panel version: {__version__}
936934
937-
Python Version: %s
938-
Qt Version: %s, %s %s
935+
Python Version: {platform.python_version()}
936+
Qt Version: {winpython._vendor.qtpy.QtCore.__version__}, {winpython.qt.API_NAME} {winpython._vendor.qtpy.__version__}
939937
940938
What steps will reproduce the problem?
941939
1.
@@ -946,44 +944,28 @@ def report_issue(self):
946944
947945
948946
Please provide any additional information below.
949-
""" % (
950-
python_distribution_infos(),
951-
__version__,
952-
platform.python_version(),
953-
winpython._vendor.qtpy.QtCore.__version__,
954-
winpython.qt.API_NAME,
955-
winpython._vendor.qtpy.__version__,
956-
)
947+
"""
957948

958-
url = QUrl("%s/issues/entry" % __project_url__)
949+
url = QUrl(f"{__project_url__}/issues/entry")
959950
url.addQueryItem("comment", issue_template)
960951
QDesktopServices.openUrl(url)
961952

962953
def about(self):
963954
"""About this program"""
964955
QMessageBox.about(
965956
self,
966-
"About %s" % self.NAME,
967-
"""<b>%s %s</b>
957+
f"About {self.NAME}",
958+
f"""<b>{self.NAME} {__version__}</b>
968959
<br>Package Manager and Advanced Tasks
969960
<p>Copyright &copy; 2012 Pierre Raybaut
970961
<br>Licensed under the terms of the MIT License
971962
<p>Created, developed and maintained by Pierre Raybaut
972-
<p><a href="%s">WinPython at Github.io</a>: downloads, bug reports,
963+
<p><a href="{__project_url__}">WinPython at Github.io</a>: downloads, bug reports,
973964
discussions, etc.</p>
974965
<p>This program is executed by:<br>
975-
<b>%s</b><br>
976-
Python %s, Qt %s, %s qtpy %s"""
977-
% (
978-
self.NAME,
979-
__version__,
980-
__project_url__,
981-
python_distribution_infos(),
982-
platform.python_version(),
983-
winpython._vendor.qtpy.QtCore.__version__,
984-
winpython._vendor.qtpy.API_NAME,
985-
winpython._vendor.qtpy.__version__,
986-
),
966+
<b>{python_distribution_infos()}</b><br>
967+
Python {platform.python_version()}, Qt {winpython._vendor.qtpy.QtCore.__version__}, {winpython._vendor.qtpy.API_NAME} qtpy {winpython._vendor.qtpy.__version__}"""
968+
,
987969
)
988970

989971

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.