Skip to content

Commit 13ee932

Browse files
committed
Remove new Python syntax from setup.py.
We cannot yet rely on pip to be new enough to recognize out python_requires, and we get several reports of broken syntax on older Python.
1 parent 66d675a commit 13ee932

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

setup.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
This may be due to an out of date pip.
1818
1919
Make sure you have pip >= 9.0.1.
20-
""".format('.'.join(str(n) for n in min_version)),
20+
""".format('.'.join(str(n) for n in min_version))
2121
sys.exit(error)
2222

2323
from pathlib import Path
@@ -112,8 +112,9 @@ def _download_jquery_to(dest):
112112
try:
113113
buff = download_or_cache(url, sha)
114114
except Exception:
115-
raise IOError(f"Failed to download jquery-ui. Please download "
116-
f"{url} and extract it to {dest}.")
115+
raise IOError(
116+
"Failed to download jquery-ui. Please download "
117+
"{url} and extract it to {dest}.".format(url=url, dest=dest))
117118
with ZipFile(buff) as zf:
118119
zf.extractall(dest)
119120

@@ -154,7 +155,7 @@ def run(self):
154155
# If the user just queries for information, don't bother figuring out which
155156
# packages to build or install.
156157
if not (any('--' + opt in sys.argv
157-
for opt in [*Distribution.display_option_names, 'help'])
158+
for opt in Distribution.display_option_names + ['help'])
158159
or 'clean' in sys.argv):
159160
# Go through all of the packages and figure out which ones we are
160161
# going to build/install.
@@ -169,10 +170,11 @@ def run(self):
169170
try:
170171
message = package.check()
171172
except setupext.Skipped as e:
172-
print_status(package.name, f"no [{e}]")
173+
print_status(package.name, "no [{e}]".format(e=e))
173174
continue
174175
if message is not None:
175-
print_status(package.name, f"yes [{message}]")
176+
print_status(package.name,
177+
"yes [{message}]".format(message=message))
176178
good_packages.append(package)
177179

178180
print_raw()

0 commit comments

Comments
 (0)