--- a/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Preferences/ConfigurationPages/MasterPasswordEntryDialog.py Fri Oct 18 23:00:41 2013 +0200 @@ -46,8 +46,8 @@ error = "" if self.currentPasswordEdit.isEnabled(): from Utilities.crypto.py3PBKDF2 import verifyPassword - enable = \ - verifyPassword(self.currentPasswordEdit.text(), self.__oldPasswordHash) + enable = verifyPassword( + self.currentPasswordEdit.text(), self.__oldPasswordHash) if not enable: error = error or self.trUtf8("Wrong password entered.") @@ -63,7 +63,8 @@ if self.currentPasswordEdit.isEnabled(): if self.newPasswordEdit.text() == self.currentPasswordEdit.text(): enable = False - error = error or self.trUtf8("Old and new password must not be the same.") + error = error or \ + self.trUtf8("Old and new password must not be the same.") self.buttonBox.button(QDialogButtonBox.Ok).setEnabled(enable) self.errorLabel.setText(error) @@ -99,11 +100,15 @@ def getMasterPassword(self): """ Public method to get the new master password. + + @return new master password (string) """ return self.newPasswordEdit.text() def getCurrentPassword(self): """ Public method to get the current master password. + + @return current master password (string) """ return self.currentPasswordEdit.text()