8000 remove most uses of list(somedict.keys()) in Demo scripts · python/cpython@1e8ce58 · GitHub
[go: up one dir, main page]
Skip to content

Commit 1e8ce58

Browse files
author
Skip Montanaro
committed
remove most uses of list(somedict.keys()) in Demo scripts
1 parent 28a181c commit 1e8ce58

File tree

17 files changed

+31
-46
lines changed

17 files changed

+31
-46
lines changed

‎Demo/cgi/cgi2.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def main():
1414
print("<h1>No Form Keys</h1>")
1515
else:
1616
print("<h1>Form Keys</h1>")
17-
for key in list(form.keys()):
17+
for key in form.keys():
1818
value = form[key].value
1919
print("<p>", cgi.escape(key), ":", cgi.escape(value))
2020

‎Demo/classes/Dbm.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def __init__(self, filename, mode, perm):
1212

1313
def __repr__(self):
1414
s = ''
15-
for key in list(self.keys()):
15+
for key in self.keys():
1616
t = repr(key) + ': ' + repr(self[key])
1717
if s: t = ', ' + t
1818
s = s + t
@@ -32,7 +32,7 @@ def __delitem__(self, key):
3232

3333
def keys(self):
3434
res = []
35-
for key in list(self.db.keys()):
35+
for key in self.db.keys():
3636
res.append(eval(key))
3737
return res
3838

‎Demo/metaclasses/Enum.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def __init__(self, name, bases, dict):
4242
self.__name__ = name
4343
self.__bases__ = bases
4444
self.__dict = {}
45-
for key, value in list(dict.items()):
45+
for key, value in dict.items():
4646
self.__dict[key] = EnumInstance(name, key, value)
4747

4848
def __getattr__(self, name):
@@ -80,7 +80,7 @@ def __repr__(self):
8080
s = s + '(' + string.join([x.__name__ for x in self.__bases__], ", ") + ')'
8181
if self.__dict:
8282
list = []
83-
for key, value in list(self.__dict.items()):
83+
for key, value in self.__dict.items():
8484
list.append("%s: %s" % (key, int(value)))
8585
s = "%s: {%s}" % (s, string.join(list, ", "))
8686
return s

‎Demo/newmetaclasses/Enum.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Color(Enum):
2020
def __init__(cls, name, bases, dict):
2121
super(EnumMetaclass, cls).__init__(name, bases, dict)
2222
cls._members = []
23-
for attr in list(dict.keys()):
23+
for attr in dict.keys():
2424
if not (attr.startswith('__') and attr.endswith('__')):
2525
enumval = EnumInstance(name, attr, dict[attr])
2626
setattr(cls, attr, enumval)

‎Demo/pdist/cmdfw.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,9 +104,7 @@ def usage(self, msg = None):
104104
c = c.__bases__[0]
105105
if docstrings:
106106
print("where subcommand can be:")
107-
names = list(docstrings.keys())
108-
names.sort()
109-
for name in names:
107+
for name in sorted(docstrings.keys()):
110108
print(docstrings[name])
111109
if self.PostUsageMessage:
112110
print(self.PostUsageMessage)

‎Demo/pdist/cmptree.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def compare(local, remote, mode):
8989
else:
9090
print("same mtime but different sum?!?!", end=' ')
9191
print()
92-
for name in list(lsumdict.keys()):
92+
for name in lsumdict.keys():
9393
if not list(rsumdict.keys()):
9494
print(repr(name), "only locally", end=' ')
9595
fl()

‎Demo/pdist/cvslib.py‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -223,15 +223,12 @@ def putentries(self):
223223
f.close()
224224

225225
def getlocalfiles(self):
226-
list = list(self.entries.keys())
226+
entries_keys = set(self.entries.keys())
227227
addlist = os.listdir(os.curdir)
228228
for name in addlist:
229-
if name in list:
230-
continue
231229
if not self.ignored(name):
232-
list.append(name)
233-
list.sort()
234-
for file in list:
230+
entries_keys.add(name)
231+
for file in sorted(entries_keys):
235232
try:
236233
e = self.entries[file]
237234
except KeyError:
@@ -257,19 +254,17 @@ def report(self):
257254
print('-'*50)
258255

259256
def keys(self):
260-
keys = list(self.entries.keys())
261-
keys.sort()
262-
return keys
257+
return sorted(self.entries.keys())
263258

264259
def values(self):
265260
def value(key, self=self):
266261
return self.entries[key]
267-
return list(map(value, list(self.keys())))
262+
return [value(k) for k in self.keys()]
268263

269264
def items(self):
270265
def item(key, self=self):
271266
return (key, self.entries[key])
272-
return list(map(item, list(self.keys())))
267+
return [item(k) for k in self.keys()]
273268

274269
def cvsexists(self, file):
275270
file = os.path.join("CVS", file)

‎Demo/pdist/rrcs.py‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,9 @@ def unlock(x, copts, fn):
7171
x.unlock(fn)
7272

7373
def info(x, copts, fn):
74-
dict = x.info(fn)
75-
keys = list(dict.keys())
76-
keys.sort()
77-
for key in keys:
78-
print(key + ':', dict[key])
74+
info_dict = x.info(fn)
75+
for key in sorted(info_dict.keys()):
76+
print(key + ':', info_dict[key])
7977
print('='*70)
8078

8179
def head(x, copts, fn):

‎Demo/pdist/server.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ def _special(self, methodname, args):
101101

102102
def _listmethods(self, cl=None):
103103
if not cl: cl = self.__class__
104-
names = list(cl.__dict__.keys())
105-
names = [x for x in names if x[0] != '_']
106-
names.sort()
104+
names = sorted([x for x in cl.__dict__.keys() if x[0] != '_'])
107105
for base in cl.__bases__:
108106
basenames = self._listmethods(base)
109107
basenames = list(filter(lambda x, names=names: x not in names, basenames))

‎Demo/scripts/ftpstats.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,7 @@ def showbar(dict, title):
106106
n = len(title)
107107
print('='*((70-n)/2), title, '='*((71-n)/2))
108108
list = []
109-
keys = list(dict.keys())
110-
keys.sort()
111-
for key in keys:
109+
for key in sorted(dict.keys()):
112110
n = len(str(key))
113111
list.append((len(dict[key]), key))
114112
maxkeylength = 0
@@ -128,8 +126,7 @@ def show(dict, title, maxitems):
128126
n = len(title)
129127
print('='*((70-n)/2), title, '='*((71-n)/2))
130128
list = []
131-
keys = list(dict.keys())
132-
for key in keys:
129+
for key in dict.keys():
133130
list.append((-len(dict[key]), key))
134131
list.sort()
135132
for count, key in list[:maxitems]:

0 commit comments

Comments
 (0)
0