Mercurial Repositories > eric / file comparison
comparison: Helpviewer/Passwords/PasswordManager.py
Helpviewer/Passwords/PasswordManager.py
- changeset 3035
- 36e9f388958b
- parent 3034
- 7ce719013078
- child 3060
- 5883ce99ee12
- child 3071
- 83d066710d60
equal
deleted
inserted
replaced
| 3034:7ce719013078 | 3035:36e9f388958b |
|---|---|
| 165 E5MessageBox.warning( | 165 E5MessageBox.warning( |
| 166 None, | 166 None, |
| 167 self.trUtf8("Loading login data"), | 167 self.trUtf8("Loading login data"), |
| 168 self.trUtf8("""Error when loading login data on""" | 168 self.trUtf8("""Error when loading login data on""" |
| 169 """ line {0}, column {1}:\n{2}""") | 169 """ line {0}, column {1}:\n{2}""") |
| 170 .format(reader.lineNumber(), | 170 .format(reader.lineNumber(), |
| 171 reader.columnNumber(), | 171 reader.columnNumber(), |
| 172 reader.errorString())) | 172 reader.errorString())) |
| 173 | 173 |
| 174 self.__loaded = True | 174 self.__loaded = True |
| 175 | 175 |
| 176 def __loadNonXml(self, loginFile): | 176 def __loadNonXml(self, loginFile): |
| 177 """ | 177 """ |
| 192 None, | 192 None, |
| 193 self.trUtf8("Loading login data"), | 193 self.trUtf8("Loading login data"), |
| 194 self.trUtf8("""<p>Login data could not be loaded """ | 194 self.trUtf8("""<p>Login data could not be loaded """ |
| 195 """from <b>{0}</b></p>""" | 195 """from <b>{0}</b></p>""" |
| 196 """<p>Reason: {1}</p>""") | 196 """<p>Reason: {1}</p>""") |
| 197 .format(loginFile, str(err))) | 197 .format(loginFile, str(err))) |
| 198 return | 198 return |
| 199 | 199 |
| 200 data = [] | 200 data = [] |
| 201 section = 0 # 0 = login data, 1 = forms data, | 201 section = 0 # 0 = login data, 1 = forms data, |
| 202 # 2 = never store info | 202 # 2 = never store info |
| 218 self.trUtf8("Loading login data"), | 218 self.trUtf8("Loading login data"), |
| 219 self.trUtf8( | 219 self.trUtf8( |
| 220 """<p>Login data could not be loaded """ | 220 """<p>Login data could not be loaded """ |
| 221 """from <b>{0}</b></p>""" | 221 """from <b>{0}</b></p>""" |
| 222 """<p>Reason: Wrong input format</p>""") | 222 """<p>Reason: Wrong input format</p>""") |
| 223 .format(loginFile)) | 223 .format(loginFile)) |
| 224 return | 224 return |
| 225 self.__logins[data[0]] = (data[1], data[2]) | 225 self.__logins[data[0]] = (data[1], data[2]) |
| 226 data = [] | 226 data = [] |
| 227 | 227 |
| 228 elif section == 1: | 228 elif section == 1: |
| 411 type_ = form.elementTypes[element[0]] | 411 type_ = form.elementTypes[element[0]] |
| 412 if user == "" and \ | 412 if user == "" and \ |
| 413 type_ == "text": | 413 type_ == "text": |
| 414 user = element[1] | 414 user = element[1] |
| 415 elif password == "" and \ | 415 elif password == "" and \ |
| 416 type_ == "password": | 416 type_ == "password": |
| 417 password = element[1] | 417 password = element[1] |
| 418 form.elements[index] = (element[0], "--PASSWORD--") | 418 form.elements[index] = (element[0], "--PASSWORD--") |
| 419 if user and password: | 419 if user and password: |
| 420 self.__logins[key] = \ | 420 self.__logins[key] = \ |
| 421 (user, Utilities.crypto.pwConvert(password, encode=True)) | 421 (user, Utilities.crypto.pwConvert(password, encode=True)) |
