Mercurial Repositories > eric / file diff

--- a/Helpviewer/HelpWindow.py	Wed Feb 07 18:57:46 2018 +0100
+++ b/Helpviewer/HelpWindow.py	Wed Feb 07 20:14:09 2018 +0100
@@ -2488,7 +2488,8 @@
             self, 'Configuration', True, fromEric=self.fromEric,
             displayMode=ConfigurationDialog.HelpBrowserMode)
         dlg.preferencesChanged.connect(self.preferencesChanged)
-        dlg.masterPasswordChanged.connect(self.masterPasswordChanged)
+        dlg.masterPasswordChanged.connect(
+            lambda old, new: self.masterPasswordChanged(old, new, local=True))
         dlg.show()
         if self.__lastConfigurationPageName:
             dlg.showConfigurationPageByName(self.__lastConfigurationPageName)
@@ -2531,16 +2532,20 @@
             self.virustotalIpReportAct.setEnabled(True)
             self.virustotalDomainReportAct.setEnabled(True)
     
-    def masterPasswordChanged(self, oldPassword, newPassword):
+    def masterPasswordChanged(self, oldPassword, newPassword, local=False):
         """
         Public slot to handle the change of the master password.
         
-        @param oldPassword current master password (string)
-        @param newPassword new master password (string)
-        """
-        from Preferences.ConfigurationDialog import ConfigurationDialog
+        @param oldPassword current master password
+        @type str
+        @param newPassword new master password
+        @type str
+        @param local flag indicating being called from the local configuration
+            dialog
+        @type bool
+        """
         self.passwordManager().masterPasswordChanged(oldPassword, newPassword)
-        if self.fromEric and isinstance(self.sender(), ConfigurationDialog):
+        if self.fromEric and local:
             # we were called from our local configuration dialog
             Preferences.convertPasswords(oldPassword, newPassword)
             Utilities.crypto.changeRememberedMaster(newPassword)
@@ -3621,17 +3626,20 @@
         feedsManager = self.feedsManager()
         feedsManager.openUrl.connect(self.openUrl)
         feedsManager.newUrl.connect(self.openUrlNewTab)
-        feedsManager.rejected.connect(self.__feedsManagerClosed)
+        feedsManager.rejected.connect(
+            lambda fm: self.__feedsManagerClosed(fm))
         feedsManager.show()
     
-    def __feedsManagerClosed(self):
+    def __feedsManagerClosed(self, feedsManager):
         """
         Private slot to handle closing the feeds manager dialog.
-        """
-        feedsManager = self.sender()
+        
+        @param feedsManager reference to the feeds manager object
+        @type FeedsManager
+        """
         feedsManager.openUrl.disconnect(self.openUrl)
         feedsManager.newUrl.disconnect(self.openUrlNewTab)
-        feedsManager.rejected.disconnect(self.__feedsManagerClosed)
+        feedsManager.rejected.disconnect()
     
     def __showSiteinfoDialog(self):
         """