gh-103668: Run pyugrade on idlelib (#103671) · python/cpython@bd2dca0 · GitHub
Skip to content

Commit bd2dca0

Browse files
sobolevnterryjreedy
sobolevn
and
terryjreedy
authored
gh-103668: Run pyugrade on idlelib (#103671)
 --------- Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
1 parent 7255bbd commit bd2dca0

17 files changed

Lines changed: 50 additions & 50 deletions

‎Lib/idlelib/calltip_w.py‎

Lines changed: 4 additions & 4 deletions

‎Lib/idlelib/debugger.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ def __frame2message(self, frame):
4949
filename = code.co_filename
5050
lineno = frame.f_lineno
5151
basename = os.path.basename(filename)
52-
message = "%s:%s" % (basename, lineno)
52+
message = f"{basename}:{lineno}"
5353
if code.co_name != "?":
54-
message = "%s: %s()" % (message, code.co_name)
54+
message = f"{message}: {code.co_name}()"
5555
return message
5656

5757

@@ -213,7 +213,8 @@ def interaction(self, message, frame, info=None):
213213
m1 = "%s" % str(type)
214214
if value is not None:
215215
try:
216-
m1 = "%s: %s" % (m1, str(value))
216+
# TODO redo entire section, tries not needed.
217+
m1 = f"{m1}: {value}"
217218
except:
218219
pass
219220
bg = "yellow"

‎Lib/idlelib/debugobj.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ def GetSubList(self):
8787
continue
8888
def setfunction(value, key=key, object=self.object):
8989
object[key] = value
90-
item = make_objecttreeitem("%r:" % (key,), value, setfunction)
90+
item = make_objecttreeitem(f"{key!r}:", value, setfunction)
9191
sublist.append(item)
9292
return sublist
9393

‎Lib/idlelib/editor.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,13 @@
3838
def _sphinx_version():
3939
"Format sys.version_info to produce the Sphinx version string used to install the chm docs"
4040
major, minor, micro, level, serial = sys.version_info
41-
release = '%s%s' % (major, minor)
42-
release += '%s' % (micro,)
41+
# TODO remove unneeded function since .chm no longer installed
42+
release = f'{major}{minor}'
43+
release += f'{micro}'
4344
if level == 'candidate':
44-
release += 'rc%s' % (serial,)
45+
release += f'rc{serial}'
4546
elif level != 'final':
46-
release += '%s%s' % (level[0], serial)
47+
release += f'{level[0]}{serial}'
4748
return release
4849

4950

@@ -950,7 +951,7 @@ def update_recent_files_list(self, new_file=None):
950951
rf_list = []
951952
file_path = self.recent_files_path
952953
if file_path and os.path.exists(file_path):
953-
with open(file_path, 'r',
954+
with open(file_path,
954955
encoding='utf_8', errors='replace') as rf_list_file:
955956
rf_list = rf_list_file.readlines()
956957
if new_file:
@@ -1458,7 +1459,7 @@ def newline_and_indent_event(self, event):
14581459
else:
14591460
self.reindent_to(y.compute_backslash_indent())
14601461
else:
1461-
assert 0, "bogus continuation type %r" % (c,)
1462+
assert 0, f"bogus continuation type {c!r}"
14621463
return "break"
14631464

14641465
# This line starts a brand new statement; indent relative to

‎Lib/idlelib/filelist.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def open(self, filename, action=None):
2222
# This can happen when bad filename is passed on command line:
2323
messagebox.showerror(
2424
"File Error",
25-
"%r is a directory." % (filename,),
25+
f"{filename!r} is a directory.",
2626
master=self.root)
2727
return None
2828
key = os.path.normcase(filename)
@@ -90,7 +90,7 @@ def filename_changed_edit(self, edit):
9090
self.inversedict[conflict] = None
9191
messagebox.showerror(
9292
"Name Conflict",
93-
"You now have multiple edit windows open for %r" % (filename,),
93+
f"You now have multiple edit windows open for {filename!r}",
9494
master=self.root)
9595
self.dict[newkey] = edit
9696
self.inversedict[edit] = newkey

‎Lib/idlelib/idle_test/test_config.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ def setUpClass(cls):
191191
idle_dir = os.path.abspath(sys.path[0])
192192
for ctype in conf.config_types:
193193
config_path = os.path.join(idle_dir, '../config-%s.def' % ctype)
194-
with open(config_path, 'r') as f:
194+
with open(config_path) as f:
195195
cls.config_string[ctype] = f.read()
196196

197197
cls.orig_warn = config._warn

‎Lib/idlelib/idle_test/test_outwin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ def test_file_line_helper(self, mock_open):
159159
for line, expected_output in test_lines:
160160
self.assertEqual(flh(line), expected_output)
161161
if expected_output:
162-
mock_open.assert_called_with(expected_output[0], 'r')
162+
mock_open.assert_called_with(expected_output[0])
163163

164164

165165
if __name__ == '__main__':

‎Lib/idlelib/multicall.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@
5252
_modifier_masks = (MC_CONTROL, MC_ALT, MC_SHIFT, MC_META)
5353

5454
# a dictionary to map a modifier name into its number
55-
_modifier_names = dict([(name, number)
55+
_modifier_names = {name: number
5656
for number in range(len(_modifiers))
57-
for name in _modifiers[number]])
57+
for name in _modifiers[number]}
5858

5959
# In 3.4, if no shell window is ever open, the underlying Tk widget is
6060
# destroyed before .__del__ methods here are called. The following
@@ -134,7 +134,7 @@ def nbits(n):
134134
return nb
135135
statelist = []
136136
for state in states:
137-
substates = list(set(state & x for x in states))
137+
substates = list({state & x for x in states})
138138
substates.sort(key=nbits, reverse=True)
139139
statelist.append(substates)
140140
return statelist
@@ -258,9 +258,9 @@ def __del__(self):
258258
_binder_classes = (_ComplexBinder,) * 4 + (_SimpleBinder,) * (len(_types)-4)
259259

260260
# A dictionary to map a type name into its number
261-
_type_names = dict([(name, number)
261+
_type_names = {name: number
262262
for number in range(len(_types))
263-
for name in _types[number]])
263+
for name in _types[number]}
264264

265265
_keysym_re = re.compile(r"^\w+$")
266266
_button_re = re.compile(r"^[1-5]$")

‎Lib/idlelib/outwin.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def file_line_helper(line):
4242
if match:
4343
filename, lineno = match.group(1, 2)
4444
try:
45-
f = open(filename, "r")
45+
f = open(filename)
4646
f.close()
4747
break
4848
except OSError:

‎Lib/idlelib/pyshell.py‎

Lines changed: 10 additions & 10 deletions

0 commit comments

Comments
 (0)