Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/__init__.py	Sun Apr 11 11:34:32 2021 +0200
+++ b/eric6/Preferences/__init__.py	Sun Apr 11 12:38:16 2021 +0200
@@ -1574,14 +1574,12 @@
     
     # second step, write the tool group entries
     prefClass.settings.setValue("Toolgroups/Groups", len(toolGroups))
-    groupIndex = 0
-    for group in toolGroups:
+    for groupIndex, group in enumerate(toolGroups):
         prefClass.settings.setValue(
             "Toolgroups/{0:02d}/Name".format(groupIndex), group[0])
         prefClass.settings.setValue(
             "Toolgroups/{0:02d}/Items".format(groupIndex), len(group[1]))
-        ind = 0
-        for tool in group[1]:
+        for ind, tool in enumerate(group[1]):
             prefClass.settings.setValue(
                 "Toolgroups/{0:02d}/{1:02d}/Menutext".format(groupIndex, ind),
                 tool['menutext'])
@@ -1598,8 +1596,6 @@
             prefClass.settings.setValue(
                 "Toolgroups/{0:02d}/{1:02d}/Redirect".format(groupIndex, ind),
                 tool['redirect'])
-            ind += 1
-        groupIndex += 1
     prefClass.settings.setValue("Toolgroups/Current Group", currentGroup)
     
 
@@ -2891,20 +2887,17 @@
         # value is list of tuples of (keyword, engine name)
         prefClass.settings.remove("WebBrowser/" + key)
         prefClass.settings.beginWriteArray("WebBrowser/" + key, len(value))
-        index = 0
-        for v in value:
+        for index, v in enumerate(value):
             prefClass.settings.setArrayIndex(index)
             prefClass.settings.setValue("Keyword", v[0])
             prefClass.settings.setValue("Engine", v[1])
-            index += 1
         prefClass.settings.endArray()
     elif key == "DownloadManagerDownloads":
         # value is list of dicts containing the URL, save location, done flag,
         # page URL, date/time downloaded
         prefClass.settings.remove("Help/" + key)
         prefClass.settings.beginWriteArray("WebBrowser/" + key, len(value))
-        index = 0
-        for v in value:
+        for index, v in enumerate(value):
             prefClass.settings.setArrayIndex(index)
             prefClass.settings.setValue("URL", v["URL"])
             prefClass.settings.setValue("Location", v["Location"])
@@ -2912,19 +2905,16 @@
             prefClass.settings.setValue("PageURL", v["PageURL"])
             prefClass.settings.setValue(
                 "Downloaded", v["Downloaded"].toString("yyyy-MM-dd hh:mm:ss"))
-            index += 1
         prefClass.settings.endArray()
     elif key == "RssFeeds":
         # value is list of tuples of (URL, title, icon)
         prefClass.settings.remove("WebBrowser/" + key)
         prefClass.settings.beginWriteArray("WebBrowser/" + key, len(value))
-        index = 0
-        for v in value:
+        for index, v in enumerate(value):
             prefClass.settings.setArrayIndex(index)
             prefClass.settings.setValue("URL", v[0])
             prefClass.settings.setValue("Title", v[1])
             prefClass.settings.setValue("Icon", v[2])
-            index += 1
         prefClass.settings.endArray()
     elif key in ["SyncFtpPassword", "SyncEncryptionKey"]:
         from Utilities.crypto import pwConvert