Mercurial Repositories > eric / file diff

--- a/PluginManager/PluginManager.py	Sun Mar 04 14:55:23 2018 +0100
+++ b/PluginManager/PluginManager.py	Mon Apr 02 12:04:18 2018 +0200
@@ -883,9 +883,8 @@
         """
         pluginDict = {}
         
-        for name, module in \
-            list(self.__onDemandActiveModules.items()) + \
-                list(self.__onDemandInactiveModules.items()):
+        for module in list(self.__onDemandActiveModules.values()) + \
+                list(self.__onDemandInactiveModules.values()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "error", "") == "":
                 plugin_name = getattr(module, "pluginTypename")
@@ -909,9 +908,8 @@
         @param name name of the plugin type (string)
         @return preview pixmap (QPixmap)
         """
-        for modname, module in \
-            list(self.__onDemandActiveModules.items()) + \
-                list(self.__onDemandInactiveModules.items()):
+        for module in list(self.__onDemandActiveModules.values()) + \
+                list(self.__onDemandInactiveModules.values()):
             if getattr(module, "pluginType") == type_ and \
                getattr(module, "pluginTypename") == name:
                 if hasattr(module, "previewPix"):
@@ -1089,9 +1087,8 @@
         """
         vcsDict = {}
         
-        for name, module in \
-            list(self.__onDemandActiveModules.items()) + \
-                list(self.__onDemandInactiveModules.items()):
+        for module in list(self.__onDemandActiveModules.values()) + \
+                list(self.__onDemandInactiveModules.values()):
             if getattr(module, "pluginType") == "version_control":
                 if hasattr(module, "getVcsSystemIndicator"):
                     res = module.getVcsSystemIndicator()
@@ -1350,11 +1347,11 @@
         
         @param type_ type of the plugin to clear private data for (string)
         """
-        for name, module in \
-            list(self.__onDemandActiveModules.items()) + \
-            list(self.__onDemandInactiveModules.items()) + \
-            list(self.__activeModules.items()) + \
-                list(self.__inactiveModules.items()):
+        for module in \
+            list(self.__onDemandActiveModules.values()) + \
+            list(self.__onDemandInactiveModules.values()) + \
+            list(self.__activeModules.values()) + \
+                list(self.__inactiveModules.values()):
             if getattr(module, "pluginType", "") == type_:
                 if hasattr(module, "clearPrivateData"):
                     module.clearPrivateData()