Mercurial Repositories > eric / changeset

--- a/eric7/DocumentationTools/APIGenerator.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/DocumentationTools/APIGenerator.py	Wed Nov 03 20:02:41 2021 +0100
@@ -54,7 +54,7 @@
         """
         bases = {}
         self.includePrivate = includePrivate
-        classNames = sorted(list(self.module.classes.keys()))
+        classNames = sorted(self.module.classes.keys())
         for className in classNames:
             if (
                 not self.__isPrivate(self.module.classes[className]) and
@@ -98,7 +98,7 @@
         """
         Private method to generate the api section for classes.
         """
-        classNames = sorted(list(self.module.classes.keys()))
+        classNames = sorted(self.module.classes.keys())
         for className in classNames:
             if not self.__isPrivate(self.module.classes[className]):
                 self.__addClassVariablesAPI(className)
@@ -113,7 +113,7 @@
         from QScintilla.Editor import Editor
         
         _class = self.module.classes[className]
-        methods = sorted(list(_class.methods.keys()))
+        methods = sorted(_class.methods.keys())
         if '__init__' in methods:
             methods.remove('__init__')
             if _class.isPublic():
@@ -169,7 +169,7 @@
         """
         from QScintilla.Editor import Editor
         
-        funcNames = sorted(list(self.module.functions.keys()))
+        funcNames = sorted(self.module.functions.keys())
         for funcName in funcNames:
             if not self.__isPrivate(self.module.functions[funcName]):
                 if self.module.functions[funcName].isPublic():

--- a/eric7/DocumentationTools/IndexGenerator.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/DocumentationTools/IndexGenerator.py	Wed Nov 03 20:02:41 2021 +0100
@@ -108,7 +108,7 @@
         # 1) subpackages
         if package["subpackages"]:
             subpacks = package["subpackages"]
-            names = sorted(list(subpacks.keys()))
+            names = sorted(subpacks.keys())
             lst = []
             for name in names:
                 link = joinext("index-{0}".format(name), ".html")
@@ -128,7 +128,7 @@
         # 2) modules
         if package["modules"]:
             mods = package["modules"]
-            names = sorted(list(mods.keys()))
+            names = sorted(mods.keys())
             lst = []
             for name in names:
                 link = joinext(name, ".html")

--- a/eric7/DocumentationTools/ModuleDocumentor.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/DocumentationTools/ModuleDocumentor.py	Wed Nov 03 20:02:41 2021 +0100
@@ -233,7 +233,7 @@
         
         @return The classes list section. (string)
         """
-        names = sorted(list(self.module.classes.keys()))
+        names = sorted(self.module.classes.keys())
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.classes)
@@ -248,7 +248,7 @@
         
         @return The modules list section. (string)
         """
-        names = sorted(list(self.module.modules.keys()))
+        names = sorted(self.module.modules.keys())
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.modules)
@@ -263,7 +263,7 @@
         
         @return The functions list section. (string)
         """
-        names = sorted(list(self.module.functions.keys()))
+        names = sorted(self.module.functions.keys())
         if names:
             self.empty = False
             s = self.__genListSection(names, self.module.functions)
@@ -278,7 +278,7 @@
         
         @return The classes details section. (string)
         """
-        classNames = sorted(list(self.module.classes.keys()))
+        classNames = sorted(self.module.classes.keys())
         classes = []
         for className in classNames:
             _class = self.module.classes[className]
@@ -445,7 +445,7 @@
         
         @return The Ruby modules details section. (string)
         """
-        rbModulesNames = sorted(list(self.module.modules.keys()))
+        rbModulesNames = sorted(self.module.modules.keys())
         rbModules = []
         for rbModuleName in rbModulesNames:
             rbModule = self.module.modules[rbModuleName]
@@ -489,7 +489,7 @@
         @return The classes list and classes details section.
             (tuple of two string)
         """
-        classNames = sorted(list(obj.classes.keys()))
+        classNames = sorted(obj.classes.keys())
         classes = []
         for className in classNames:
             _class = obj.classes[className]
@@ -562,7 +562,7 @@
         @return The functions details section. (string)
         """
         funcBodies = []
-        funcNames = sorted(list(self.module.functions.keys()))
+        funcNames = sorted(self.module.functions.keys())
         for funcName in funcNames:
             try:
                 funcBody = TemplatesListsStyleCSS.functionTemplate.format(
@@ -682,7 +682,7 @@
         @return The list section. (string)
         """
         lst = []
-        keys = sorted(list(dictionary.keys()))
+        keys = sorted(dictionary.keys())
         for key in keys:
             lst.append(template.format(
                 **{'Name': key,

--- a/eric7/EricWidgets/EricTreeView.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/EricWidgets/EricTreeView.py	Wed Nov 03 20:02:41 2021 +0100
@@ -43,7 +43,7 @@
             return
         
         selectedRows = self.selectionModel().selectedRows()
-        for idx in reversed(sorted(selectedRows)):
+        for idx in sorted(selectedRows, reverse=True):
             self.model().removeRow(idx.row(), idx.parent())
     
     def removeAll(self):

--- a/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Network/IRC/IrcIdentitiesEditDialog.py	Wed Nov 03 20:02:41 2021 +0100
@@ -55,7 +55,7 @@
         self.__identities = self.__manager.getIdentities()
         self.__currentIdentity = None
         
-        identities = list(sorted(self.__manager.getIdentityNames()))
+        identities = sorted(self.__manager.getIdentityNames())
         identities[identities.index(IrcIdentity.DefaultIdentityName)] = (
             IrcIdentity.DefaultIdentityDisplay
         )

--- a/eric7/Network/IRC/IrcNetworkEditDialog.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Network/IRC/IrcNetworkEditDialog.py	Wed Nov 03 20:02:41 2021 +0100
@@ -102,7 +102,7 @@
         self.identityCombo.clear()
         
         from .IrcNetworkManager import IrcIdentity
-        identities = list(sorted(self.__manager.getIdentityNames()))
+        identities = sorted(self.__manager.getIdentityNames())
         identities[identities.index(IrcIdentity.DefaultIdentityName)] = (
             IrcIdentity.DefaultIdentityDisplay
         )

--- a/eric7/Network/IRC/IrcNetworkManager.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Network/IRC/IrcNetworkManager.py	Wed Nov 03 20:02:41 2021 +0100
@@ -610,7 +610,7 @@
         
         @return list of channel names (list of string)
         """
-        return list(sorted(self.__channels.keys()))
+        return sorted(self.__channels.keys())
     
     def getChannel(self, channelName):
         """
@@ -1014,4 +1014,4 @@
         if not self.__loaded:
             self.__load()
         
-        return list(sorted(self.__networks.keys()))
+        return sorted(self.__networks.keys())

--- a/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleFixer.py	Wed Nov 03 20:02:41 2021 +0100
@@ -2597,9 +2597,9 @@
         
         candidates = self.__shortenLine(tokens, source, indent)
         if candidates:
-            candidates = list(sorted(
+            candidates = sorted(
                 set(candidates).union([self.__text]),
-                key=lambda x: self.__lineShorteningRank(x)))
+                key=lambda x: self.__lineShorteningRank(x))
             if candidates[0] == self.__text:
                 return False, "", ""
             return True, candidates[0], ""

--- a/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Preferences/ConfigurationPages/EditorExportersPage.py	Wed Nov 03 20:02:41 2021 +0100
@@ -36,7 +36,7 @@
         self.pageIds['PDF'] = self.stackedWidget.indexOf(self.pdfPage)
         self.pageIds['RTF'] = self.stackedWidget.indexOf(self.rtfPage)
         self.pageIds['TeX'] = self.stackedWidget.indexOf(self.texPage)
-        exporters = sorted(list(self.pageIds.keys()))
+        exporters = sorted(self.pageIds.keys())
         for exporter in exporters:
             self.exportersCombo.addItem(exporter, self.pageIds[exporter])
         

--- a/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Preferences/ConfigurationPages/EditorTypingPage.py	Wed Nov 03 20:02:41 2021 +0100
@@ -34,7 +34,7 @@
             'Ruby': self.stackedWidget.indexOf(self.rubyPage),
             'YAML': self.stackedWidget.indexOf(self.yamlPage),
         }
-        languages = sorted(list(self.pageIds.keys()))
+        languages = sorted(self.pageIds.keys())
         for language in languages:
             self.languageCombo.addItem(language, self.pageIds[language])
         

--- a/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Preferences/ConfigurationPages/InterfacePage.py	Wed Nov 03 20:02:41 2021 +0100
@@ -224,7 +224,7 @@
         Private method to populate the style combo box.
         """
         curStyle = Preferences.getUI("Style")
-        styles = sorted(list(QStyleFactory.keys()))
+        styles = sorted(QStyleFactory.keys())
         self.styleComboBox.addItem(self.tr('System'), "System")
         for style in styles:
             self.styleComboBox.addItem(style, style)
@@ -257,7 +257,7 @@
                         "Translate this with your language") +
                     " ({0})".format(locale)
                 )
-        localeList = sorted(list(locales.keys()))
+        localeList = sorted(locales.keys())
         try:
             uiLanguage = Preferences.getUILanguage()
             if uiLanguage == "None" or uiLanguage is None:

--- a/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Preferences/ConfigurationPages/WebBrowserInterfacePage.py	Wed Nov 03 20:02:41 2021 +0100
@@ -57,7 +57,7 @@
         Private method to populate the style combo box.
         """
         curStyle = Preferences.getUI("Style")
-        styles = sorted(list(QStyleFactory.keys()))
+        styles = sorted(QStyleFactory.keys())
         self.styleComboBox.addItem(self.tr('System'), "System")
         for style in styles:
             self.styleComboBox.addItem(style, style)

--- a/eric7/Project/Project.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Project/Project.py	Wed Nov 03 20:02:41 2021 +0100
@@ -1558,8 +1558,8 @@
             if fnmatch.fnmatch(bfn, '*.ts') or fnmatch.fnmatch(bfn, '*.qm'):
                 filetype = "TRANSLATIONS"
             else:
-                for pattern in reversed(
-                        sorted(self.pdata["FILETYPES"].keys())):
+                for pattern in sorted(self.pdata["FILETYPES"].keys(),
+                                      reverse=True):
                     if fnmatch.fnmatch(bfn, pattern):
                         filetype = self.pdata["FILETYPES"][pattern]
                         break
@@ -2067,8 +2067,8 @@
             for fn in self.pdata[key][:]:
                 filetype = key
                 bfn = os.path.basename(fn)
-                for pattern in reversed(
-                        sorted(self.pdata["FILETYPES"].keys())):
+                for pattern in sorted(self.pdata["FILETYPES"].keys(),
+                                      reverse=True):
                     if fnmatch.fnmatch(bfn, pattern):
                         filetype = self.pdata["FILETYPES"][pattern]
                         break
@@ -4653,8 +4653,8 @@
                 
                 filetype = ""
                 bfn = os.path.basename(fn)
-                for pattern in reversed(
-                        sorted(self.pdata["FILETYPES"].keys())):
+                for pattern in sorted(self.pdata["FILETYPES"].keys(),
+                                      reverse=True):
                     if fnmatch.fnmatch(bfn, pattern):
                         filetype = self.pdata["FILETYPES"][pattern]
                         break

--- a/eric7/QScintilla/Editor.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/QScintilla/Editor.py	Wed Nov 03 20:02:41 2021 +0100
@@ -1070,7 +1070,7 @@
         from . import Lexers
         self.supportedLanguages = {}
         supportedLanguages = Lexers.getSupportedLanguages()
-        languages = sorted(list(supportedLanguages.keys()))
+        languages = sorted(supportedLanguages.keys())
         for language in languages:
             if language != "Guessed":
                 self.supportedLanguages[language] = (
@@ -5196,11 +5196,10 @@
         @type list of str or set of str
         """
         acCompletions = (
-            sorted(
-                list(completions),
-                key=self.__replaceLeadingUnderscores)
+            sorted(completions,
+                   key=self.__replaceLeadingUnderscores)
             if Preferences.getEditor("AutoCompletionReversedList") else
-            sorted(list(completions))
+            sorted(completions)
         )
         self.showUserList(EditorAutoCompletionListID, acCompletions)
     

--- a/eric7/QScintilla/MiniEditor.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/QScintilla/MiniEditor.py	Wed Nov 03 20:02:41 2021 +0100
@@ -3176,7 +3176,7 @@
         from . import Lexers
         self.supportedLanguages = {}
         supportedLanguages = Lexers.getSupportedLanguages()
-        languages = sorted(list(supportedLanguages.keys()))
+        languages = sorted(supportedLanguages.keys())
         for language in languages:
             if language != "Guessed":
                 self.supportedLanguages[language] = (

--- a/eric7/Utilities/ModuleParser.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/Utilities/ModuleParser.py	Wed Nov 03 20:02:41 2021 +0100
@@ -1262,7 +1262,7 @@
         @param fn function to call for classe that are already part of the
             result dictionary
         """
-        if path[0] in list(list(result.keys())):
+        if path[0] in result:
             if len(path) > 1:
                 fn(path[1:], result[path[0]], fn)
         else:

--- a/eric7/VCS/ProjectHelper.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/VCS/ProjectHelper.py	Wed Nov 03 20:02:41 2021 +0100
@@ -402,7 +402,7 @@
             return
         
         vcsSystemsDisplay = []
-        keys = sorted(list(vcsSystemsDict.keys()))
+        keys = sorted(vcsSystemsDict.keys())
         for key in keys:
             vcsSystemsDisplay.append(vcsSystemsDict[key])
         vcsSelected, ok = QInputDialog.getItem(

--- a/eric7/ViewManager/ViewManager.py	Wed Nov 03 19:45:20 2021 +0100
+++ b/eric7/ViewManager/ViewManager.py	Wed Nov 03 20:02:41 2021 +0100
@@ -867,7 +867,7 @@
         
         import QScintilla.Exporters
         supportedExporters = QScintilla.Exporters.getSupportedFormats()
-        exporters = sorted(list(supportedExporters.keys()))
+        exporters = sorted(supportedExporters.keys())
         for exporter in exporters:
             act = menu.addAction(supportedExporters[exporter])
             act.setData(exporter)