Mercurial Repositories > eric / file comparison
comparison: eric6/UI/EmailDialog.py
eric6/UI/EmailDialog.py
- changeset 7836
- 2f0d208b8137
- parent 7785
- 9978016560ec
- child 7849
- 70e464748aaa
equal
deleted
inserted
replaced
| 7835:0835ed67714b | 7836:2f0d208b8137 |
|---|---|
| 328 # abort | 328 # abort |
| 329 return False | 329 return False |
| 330 try: | 330 try: |
| 331 server.login(Preferences.getUser("MailServerUser"), | 331 server.login(Preferences.getUser("MailServerUser"), |
| 332 password) | 332 password) |
| 333 except (smtplib.SMTPException, socket.error) as e: | 333 except (smtplib.SMTPException, OSError) as e: |
| 334 if isinstance(e, smtplib.SMTPResponseException): | 334 if isinstance(e, smtplib.SMTPResponseException): |
| 335 errorStr = e.smtp_error.decode() | 335 errorStr = e.smtp_error.decode() |
| 336 elif isinstance(e, OSError): | 336 elif isinstance(e, OSError): |
| 337 errorStr = e.strerror | 337 errorStr = e.strerror |
| 338 elif isinstance(e, socket.error): | 338 elif isinstance(e, OSError): |
| 339 errorStr = e[1] | 339 errorStr = e[1] |
| 340 else: | 340 else: |
| 341 errorStr = str(e) | 341 errorStr = str(e) |
| 342 res = E5MessageBox.retryAbort( | 342 res = E5MessageBox.retryAbort( |
| 343 self, | 343 self, |
| 353 | 353 |
| 354 with E5OverrideCursor(): | 354 with E5OverrideCursor(): |
| 355 server.sendmail(Preferences.getUser("Email"), self.__toAddress, | 355 server.sendmail(Preferences.getUser("Email"), self.__toAddress, |
| 356 msg) | 356 msg) |
| 357 server.quit() | 357 server.quit() |
| 358 except (smtplib.SMTPException, socket.error) as e: | 358 except (smtplib.SMTPException, OSError) as e: |
| 359 if isinstance(e, smtplib.SMTPResponseException): | 359 if isinstance(e, smtplib.SMTPResponseException): |
| 360 errorStr = e.smtp_error.decode() | 360 errorStr = e.smtp_error.decode() |
| 361 elif isinstance(e, smtplib.SMTPException): | 361 elif isinstance(e, smtplib.SMTPException): |
| 362 errorStr = str(e) | 362 errorStr = str(e) |
| 363 elif isinstance(e, socket.error): | 363 elif isinstance(e, OSError): |
| 364 errorStr = e.strerror | 364 errorStr = e.strerror |
| 365 else: | 365 else: |
| 366 errorStr = str(e) | 366 errorStr = str(e) |
| 367 res = E5MessageBox.retryAbort( | 367 res = E5MessageBox.retryAbort( |
| 368 self, | 368 self, |
