Mercurial Repositories > eric / file comparison
comparison: src/eric7/UI/EmailDialog.py
src/eric7/UI/EmailDialog.py
- branch
- eric7
- changeset 10050
- 3750abc45d5e
- parent 9653
- e67609152c5e
- child 10069
- 435cc5875135
equal
deleted
inserted
replaced
| 10049:61a1757626ac | 10050:3750abc45d5e |
|---|---|
| 350 if not ok: | 350 if not ok: |
| 351 # abort | 351 # abort |
| 352 return False | 352 return False |
| 353 try: | 353 try: |
| 354 server.login(Preferences.getUser("MailServerUser"), password) | 354 server.login(Preferences.getUser("MailServerUser"), password) |
| 355 except (smtplib.SMTPException, OSError) as e: | 355 except (OSError, smtplib.SMTPException) as e: |
| 356 if isinstance(e, smtplib.SMTPResponseException): | 356 if isinstance(e, smtplib.SMTPResponseException): |
| 357 errorStr = e.smtp_error.decode() | 357 errorStr = e.smtp_error.decode() |
| 358 elif isinstance(e, OSError): | 358 elif isinstance(e, OSError): |
| 359 errorStr = e.strerror | 359 errorStr = e.strerror |
| 360 elif isinstance(e, OSError): | 360 elif isinstance(e, OSError): |
| 375 return False | 375 return False |
| 376 | 376 |
| 377 with EricOverrideCursor(): | 377 with EricOverrideCursor(): |
| 378 server.sendmail(Preferences.getUser("Email"), self.__toAddress, msg) | 378 server.sendmail(Preferences.getUser("Email"), self.__toAddress, msg) |
| 379 server.quit() | 379 server.quit() |
| 380 except (smtplib.SMTPException, OSError) as e: | 380 except (OSError, smtplib.SMTPException) as e: |
| 381 if isinstance(e, smtplib.SMTPResponseException): | 381 if isinstance(e, smtplib.SMTPResponseException): |
| 382 errorStr = e.smtp_error.decode() | 382 errorStr = e.smtp_error.decode() |
| 383 elif isinstance(e, smtplib.SMTPException): | 383 elif isinstance(e, smtplib.SMTPException): |
| 384 errorStr = str(e) | 384 errorStr = str(e) |
| 385 elif isinstance(e, OSError): | 385 elif isinstance(e, OSError): |
