Use sorted (#528)

Author: vil02

contrib/help-pages-translation-to-french/gen-html.py

@@ -158,10 +158,8 @@ def gen_main_html():
 
 def gen_rules_html():
     # ls = glob(os.path.join('rules', '*.html'))
-    rules_ls = os.listdir('rules')
-    rules_ls.sort()
-    wikipedia_ls = os.listdir('wikipedia')
-    wikipedia_ls.sort()
+    rules_ls = sorted(os.listdir('rules'))
+    wikipedia_ls = sorted(os.listdir('wikipedia'))
 
     games = GAME_DB.getGamesIdSortedByName()
     rules_list = []

html-src/gen-html.py

@@ -176,10 +176,8 @@ def gen_main_html():
 
 def gen_rules_html():
     # ls = glob(os.path.join('rules', '*.html'))
-    rules_ls = os.listdir('rules')
-    rules_ls.sort()
-    wikipedia_ls = os.listdir('wikipedia')
-    wikipedia_ls.sort()
+    rules_ls = sorted(os.listdir('rules'))
+    wikipedia_ls = sorted(os.listdir('wikipedia'))
 
     games = GAME_DB.getGamesIdSortedByName()
     rules_list = []

pysollib/kivy/menubar.py

@@ -1240,9 +1240,7 @@ def buildTree(self, tv, node):
         data_dir = os.path.join(self.app.dataloader.dir, 'images', 'pause')
         dl = tv.add_node(
             LTreeNode(text=_('Pause text')), rg)
-        styledirs = os.listdir(data_dir)
-        styledirs.sort()
-        for f in styledirs:
+        for f in sorted(os.listdir(data_dir)):
             d = os.path.join(data_dir, f)
             if os.path.isdir(d) and os.path.exists(os.path.join(d)):
                 name = f.replace('_', ' ').capitalize()
@@ -1255,9 +1253,7 @@ def buildTree(self, tv, node):
                                 'redealicons')
         dl = tv.add_node(
             LTreeNode(text=_('Redeal icons')), rg)
-        styledirs = os.listdir(data_dir)
-        styledirs.sort()
-        for f in styledirs:
+        for f in sorted(os.listdir(data_dir)):
             d = os.path.join(data_dir, f)
             if os.path.isdir(d) and os.path.exists(os.path.join(d)):
                 name = f.replace('_', ' ').capitalize()

pysollib/ui/tktile/menubar.py

@@ -24,8 +24,7 @@ def createToolbarMenu(menubar, menu):
     tearoff = menu.cget('tearoff')
     data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'toolbar')
     submenu = MfxMenu(menu, label=n_('Icon style'), tearoff=tearoff)
-    styledirs = sorted(os.listdir(data_dir))
-    for f in styledirs:
+    for f in sorted(os.listdir(data_dir)):
         d = os.path.join(data_dir, f)
         if os.path.isdir(d) and os.path.exists(os.path.join(d, 'small')):
             name = f.replace('_', ' ').capitalize()
@@ -116,8 +115,7 @@ def createOtherGraphicsMenu(menubar, menu):
                 value=f, command=menubar.mOptDemoLogoStyle)
     data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'dialog')
     submenu = MfxMenu(menu, label=n_('D&ialog icons'), tearoff=tearoff)
-    styledirs = sorted(os.listdir(data_dir))
-    for f in styledirs:
+    for f in sorted(os.listdir(data_dir)):
         d = os.path.join(data_dir, f)
         if os.path.isdir(d) and os.path.exists(os.path.join(d)):
             name = f.replace('_', ' ').capitalize()
@@ -127,8 +125,7 @@ def createOtherGraphicsMenu(menubar, menu):
                 value=f, command=menubar.mOptDialogIconStyle)
     data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'pause')
     submenu = MfxMenu(menu, label=n_('&Pause text'), tearoff=tearoff)
-    styledirs = sorted(os.listdir(data_dir))
-    for f in styledirs:
+    for f in sorted(os.listdir(data_dir)):
         d = os.path.join(data_dir, f)
         if os.path.isdir(d) and os.path.exists(os.path.join(d)):
             name = f.replace('_', ' ').capitalize()
@@ -139,8 +136,7 @@ def createOtherGraphicsMenu(menubar, menu):
     data_dir = os.path.join(menubar.app.dataloader.dir, 'images',
                             'redealicons')
     submenu = MfxMenu(menu, label=n_('&Redeal icons'), tearoff=tearoff)
-    styledirs = sorted(os.listdir(data_dir))
-    for f in styledirs:
+    for f in sorted(os.listdir(data_dir)):
         d = os.path.join(data_dir, f)
         if os.path.isdir(d) and os.path.exists(os.path.join(d)):
             name = f.replace('_', ' ').capitalize()
@@ -150,8 +146,7 @@ def createOtherGraphicsMenu(menubar, menu):
                 value=f, command=menubar.mOptRedealIconStyle)
     data_dir = os.path.join(menubar.app.dataloader.dir, 'images', 'tree')
     submenu = MfxMenu(menu, label=n_('&Tree icons'), tearoff=tearoff)
-    styledirs = sorted(os.listdir(data_dir))
-    for f in styledirs:
+    for f in sorted(os.listdir(data_dir)):
         d = os.path.join(data_dir, f)
         if os.path.isdir(d) and os.path.exists(os.path.join(d)):
             name = f.replace('_', ' ').capitalize()

scripts/cardset_viewer.py

@@ -189,8 +189,7 @@ def read_into_listbox():
     if ls:
         cardsets_dict = create_cs_list(ls)
 
-        cardsets_list = list(cardsets_dict)
-        cardsets_list.sort()
+        cardsets_list = sorted(cardsets_dict)
 
         list_box.delete(0, tkinter.END)