equal
deleted
inserted
replaced
85 acc.set_note(note) |
85 acc.set_note(note) |
86 acc.save() |
86 acc.save() |
87 self._make_account_dirs(acc) |
87 self._make_account_dirs(acc) |
88 return (None, password)[rand_pass] |
88 return (None, password)[rand_pass] |
89 |
89 |
90 def user_password(self, emailaddress, password=None): |
90 def user_password(self, emailaddress, password=None, scheme=None): |
91 """Override the parent user_password() - add the interactive |
91 """Override the parent user_password() - add the interactive |
92 password dialog.""" |
92 password dialog.""" |
93 acc = self._get_account(emailaddress) |
93 acc = self._get_account(emailaddress) |
94 if not acc: |
94 if not acc: |
95 raise VMMError(_("The account '%s' does not exist.") % |
95 raise VMMError(_("The account '%s' does not exist.") % |
96 acc.address, NO_SUCH_ACCOUNT) |
96 acc.address, NO_SUCH_ACCOUNT) |
97 if not isinstance(password, str) or not password: |
97 if not isinstance(password, str) or not password: |
98 password = read_pass() |
98 password = read_pass() |
99 acc.modify('password', password) |
99 acc.update_password(password, scheme) |
100 |
100 |
101 del _ |
101 del _ |