Mercurial Repositories > eric / file diff

--- a/UI/UserInterface.py	Wed Nov 07 19:05:08 2018 +0100
+++ b/UI/UserInterface.py	Sat Nov 10 10:42:43 2018 +0100
@@ -5870,9 +5870,16 @@
         self.masterPasswordChanged.emit(oldPassword, newPassword)
         Preferences.convertPasswords(oldPassword, newPassword)
         if self.helpWindow is None:
-            from Helpviewer.Passwords.PasswordManager import PasswordManager
-            pwManager = PasswordManager()
-            pwManager.masterPasswordChanged(oldPassword, newPassword)
+            if WEBENGINE_AVAILABLE:
+                from WebBrowser.Passwords.PasswordManager import \
+                    PasswordManager
+                pwManager = PasswordManager()
+                pwManager.masterPasswordChanged(oldPassword, newPassword)
+            elif WEBKIT_AVAILABLE:
+                from Helpviewer.Passwords.PasswordManager import \
+                    PasswordManager
+                pwManager = PasswordManager()
+                pwManager.masterPasswordChanged(oldPassword, newPassword)
         Utilities.crypto.changeRememberedMaster(newPassword)
         
     def __reloadAPIs(self):
@@ -7052,8 +7059,8 @@
     
     def getOriginalPathString(self):
         """
-        Public method to get the original PATH environment variable (i.e.
-        before modifications by eric6 and PyQt5)
+        Public method to get the original PATH environment variable
+        (i.e. before modifications by eric6 and PyQt5).
         
         @return original PATH environment variable
         @rtype str