diff -r 0a02c433f52d -r 5883ce99ee12 Helpviewer/Passwords/PasswordManager.py --- a/Helpviewer/Passwords/PasswordManager.py Fri Nov 01 15:48:48 2013 +0100 +++ b/Helpviewer/Passwords/PasswordManager.py Sun Nov 03 15:58:22 2013 +0100 @@ -102,7 +102,7 @@ key = self.__createKey(url, realm) self.__logins[key] = ( - username, + username, Utilities.crypto.pwConvert(password, encode=True) ) self.changed.emit() @@ -168,10 +168,10 @@ None, self.trUtf8("Loading login data"), self.trUtf8("""Error when loading login data on""" - """ line {0}, column {1}:\n{2}""")\ - .format(reader.lineNumber(), - reader.columnNumber(), - reader.errorString())) + """ line {0}, column {1}:\n{2}""") + .format(reader.lineNumber(), + reader.columnNumber(), + reader.errorString())) self.__loaded = True @@ -195,8 +195,8 @@ self.trUtf8("Loading login data"), self.trUtf8("""<p>Login data could not be loaded """ """from <b>{0}</b></p>""" - """<p>Reason: {1}</p>""")\ - .format(loginFile, str(err))) + """<p>Reason: {1}</p>""") + .format(loginFile, str(err))) return data = [] @@ -221,8 +221,8 @@ self.trUtf8( """<p>Login data could not be loaded """ """from <b>{0}</b></p>""" - """<p>Reason: Wrong input format</p>""")\ - .format(loginFile)) + """<p>Reason: Wrong input format</p>""") + .format(loginFile)) return self.__logins[data[0]] = (data[1], data[2]) data = [] @@ -357,7 +357,7 @@ # determine the QWebPage webPage = request.attribute(QNetworkRequest.User + 100) - if webPage is None: + if webPage is None: return # determine the requests content type @@ -415,7 +415,7 @@ type_ == "text": user = element[1] elif password == "" and \ - type_ == "password": + type_ == "password": password = element[1] form.elements[index] = (element[0], "--PASSWORD--") if user and password: @@ -468,7 +468,7 @@ formHasPasswords = False formName = map["name"] formIndex = map["index"] - if type(formIndex) == type(0.0) and formIndex.is_integer(): + if isinstance(formIndex, float) and formIndex.is_integer(): formIndex = int(formIndex) elements = map["elements"] formElements = set()