Mercurial Repositories > eric / file diff

--- a/Helpviewer/Passwords/PasswordManager.py	Thu Mar 09 17:56:06 2017 +0100
+++ b/Helpviewer/Passwords/PasswordManager.py	Thu Mar 09 19:28:59 2017 +0100
@@ -486,13 +486,13 @@
         # extract the forms
         from Helpviewer.JavaScriptResources import parseForms_js
         lst = webPage.mainFrame().evaluateJavaScript(parseForms_js)
-        for map in lst:
+        for formMap in lst:
             formHasPasswords = False
-            formName = map["name"]
-            formIndex = map["index"]
+            formName = formMap["name"]
+            formIndex = formMap["index"]
             if isinstance(formIndex, float) and formIndex.is_integer():
                 formIndex = int(formIndex)
-            elements = map["elements"]
+            elements = formMap["elements"]
             formElements = set()
             formElementTypes = {}
             deadElements = set()
@@ -637,9 +637,10 @@
         for key in self.__logins:
             progress.setValue(count)
             QCoreApplication.processEvents()
-            username, hash = self.__logins[key]
-            pwHash = Utilities.crypto.pwRecode(hash, oldPassword, newPassword)
-            self.__logins[key] = (username, pwHash)
+            username, oldPwHash = self.__logins[key]
+            newPwHash = Utilities.crypto.pwRecode(oldPwHash, oldPassword,
+                                                  newPassword)
+            self.__logins[key] = (username, newPwHash)
             count += 1
         
         progress.setValue(len(self.__logins))