Replaced XXX.keys() calls with idiomatic python 3 calls that are compatible with python 2 such as eg:
 * replaced "y = xxx.keys()" or "y = list(xxx.keys())" with just "y = list(xxx)"
 * replaced "sorted(xxx.keys())" or "sorted(list(xxx.keys()))" with just "sorted(xxx)"
 * replaced "if not A in B.keys():" with "if A not in B:"
 * replaced "for A in B.keys():"  with "for A in B:"

See also https://python-future.org/compatible_idioms.html
https://python-future.org/compatible_idioms.html#dict-keys-values-items-as-a-list
This commit is contained in:
Per A. Brodtkorb
2020-03-20 18:51:19 +01:00
parent ef1edacc20
commit 033c18fd9f
54 changed files with 164 additions and 193 deletions

View File

@@ -171,8 +171,7 @@ def RemoveHTMLTags(data):
def FormatDocs(keyword, values, num):
names = list(values.keys())
names.sort()
names = sorted(values)
headers = (num == 2 and [_eventHeaders] or [_styleHeaders])[0]
table = (num == 2 and [_eventTable] or [_styleTable])[0]
@@ -1014,10 +1013,7 @@ def HuntExternalDemos():
# Sort and reverse the external demos keys so that they
# come back in alphabetical order
keys = list(externalDemos.keys())
keys.sort()
keys.reverse()
keys = sorted(externalDemos, reverse=True)
# Loop over all external packages
for extern in keys:
package = externalDemos[extern]
@@ -1733,8 +1729,7 @@ class wxPythonDemo(wx.Frame):
item.Check(self.allowAuiFloating)
self.Bind(wx.EVT_MENU, self.OnAllowAuiFloating, item)
auiPerspectives = list(self.auiConfigurations.keys())
auiPerspectives.sort()
auiPerspectives = sorted(self.auiConfigurations)
perspectivesMenu = wx.Menu()
item = wx.MenuItem(perspectivesMenu, -1, DEFAULT_PERSPECTIVE, "Load startup default perspective", wx.ITEM_RADIO)
self.Bind(wx.EVT_MENU, self.OnAUIPerspectives, item)