@@ -41,11 +41,8 @@ def __init__(self):
41
41
self .url = None
42
42
43
43
def __str__ (self ):
44
- text = "%s %s" % (self .name , self .version )
45
- text += "\r \n %s\r \n Website: %s" % (
46
- self .description ,
47
- self .url ,
48
- )
44
+ text = f"{ self .name } { self .version } "
45
+ text += f"\r \n { self .description } \r \n Website: { self .url } "
49
46
return text
50
47
51
48
def from_text (self , text ):
@@ -59,26 +56,15 @@ def from_text(self, text):
59
56
).groups ()
60
57
61
58
def to_wiki (self ):
62
- return " * [%s](%s) %s (%s)\r \n " % (
63
- self .name ,
64
- self .url ,
65
- self .version ,
66
- self .description ,
67
- )
59
+ return f" * [{ self .name } ]({ self .url } ) { self .version } ({ self .description } )\r \n "
68
60
69
61
def upgrade_wiki (self , other ):
70
62
# wheel replace '-' per '_' in package name
71
63
assert (
72
64
self .name .replace ('-' , '_' ).lower ()
73
65
== other .name .replace ('-' , '_' ).lower ()
74
66
)
75
- return " * [%s](%s) %s → %s (%s)\r \n " % (
76
- self .name ,
77
- self .url ,
78
- other .version ,
79
- self .version ,
80
- self .description ,
81
- )
67
+ return f" * [{ self .name } ]({ self .url } ) { other .version } → { self .version } ({ self .description } )\r \n "
82
68
83
69
84
70
class PackageIndex (object ):
@@ -181,8 +167,7 @@ def diff_package_dicts(dict1_in, dict2_in):
181
167
)
182
168
if upgraded_list :
183
169
text += (
184
- "Upgraded packages:\r \n \r \n %s\r \n "
185
- % "" .join (upgraded_list )
170
+ f"Upgraded packages:\r \n \r \n { '' .join (upgraded_list } \r \n "
186
171
)
187
172
# Removed packages
188
173
removed = sorted (set1 - set2 )
@@ -213,9 +198,9 @@ def find_closer_version(
213
198
try :
214
199
index = versions .index (version1 )
215
200
except ValueError :
216
- raise ValueError ("Unknown version %s" % version1 )
201
+ raise ValueError (f "Unknown version { version1 } " )
217
202
if index == 0 :
218
- print ("No version prior to %s" % version1 )
203
+ print (f "No version prior to { version1 } " )
219
204
index += 1 # we don't want to fail on this
220
205
return versions [index - 1 ]
221
206
@@ -239,12 +224,10 @@ def compare_package_indexes(
239
224
flavor1 = flavor1 if flavor1 is not None else flavor
240
225
text = '\r \n ' .join (
241
226
[
242
- "## History of changes for WinPython-%sbit %s"
243
- % (architecture , version2 + flavor ),
227
+ f"## History of changes for WinPython-{ architecture } bit { version2 + flavor } " ,
244
228
"" ,
245
- "The following changes were made to WinPython-%sbit"
246
- " distribution since version %s."
247
- % (architecture , version1 + flavor1 ),
229
+ f"The following changes were made to WinPython-{ architecture } bit"
230
+ f" distribution since version { version1 + flavor1 } ." ,
248
231
"" ,
249
232
"<details>" ,
250
233
"" ,
@@ -354,7 +337,7 @@ def test_parse_package_index_wiki(
354
337
flavor = flavor ,
355
338
architecture = architecture ,
356
339
)
357
- utils .print_box ("WinPython %s:" % pi .version )
340
+ utils .print_box (f "WinPython { pi .version } :" )
358
341
utils .print_box ("Tools:" )
359
342
for package in pi .other_packages .values ():
360
343
print (package )
0 commit comments