Mercurial Repositories > eric / file comparison
comparison: Preferences/ConfigurationPages/EmailPage.py
Preferences/ConfigurationPages/EmailPage.py
- changeset 3020
- 542e97d4ecb3
- parent 3010
- befeff46ec0f
- child 3025
- 67064c71df21
equal
deleted
inserted
replaced
| 3019:7912530a33e2 | 3020:542e97d4ecb3 |
|---|---|
| 121 server.starttls() | 121 server.starttls() |
| 122 try: | 122 try: |
| 123 server.login(self.mailUserEdit.text(), | 123 server.login(self.mailUserEdit.text(), |
| 124 self.mailPasswordEdit.text()) | 124 self.mailPasswordEdit.text()) |
| 125 QApplication.restoreOverrideCursor() | 125 QApplication.restoreOverrideCursor() |
| 126 E5MessageBox.information(self, | 126 E5MessageBox.information( |
| 127 self, | |
| 127 self.trUtf8("Login Test"), | 128 self.trUtf8("Login Test"), |
| 128 self.trUtf8("""The login test succeeded.""")) | 129 self.trUtf8("""The login test succeeded.""")) |
| 129 except (smtplib.SMTPException, socket.error) as e: | 130 except (smtplib.SMTPException, socket.error) as e: |
| 130 QApplication.restoreOverrideCursor() | 131 QApplication.restoreOverrideCursor() |
| 131 if isinstance(e, smtplib.SMTPResponseException): | 132 if isinstance(e, smtplib.SMTPResponseException): |
| 137 errorStr = e[1] | 138 errorStr = e[1] |
| 138 except TypeError: | 139 except TypeError: |
| 139 errorStr = str(e) | 140 errorStr = str(e) |
| 140 else: | 141 else: |
| 141 errorStr = str(e) | 142 errorStr = str(e) |
| 142 E5MessageBox.critical(self, | 143 E5MessageBox.critical( |
| 144 self, | |
| 143 self.trUtf8("Login Test"), | 145 self.trUtf8("Login Test"), |
| 144 self.trUtf8( | 146 self.trUtf8( |
| 145 """<p>The login test failed.<br>Reason: {0}</p>""") | 147 """<p>The login test failed.<br>Reason: {0}</p>""") |
| 146 .format(errorStr)) | 148 .format(errorStr)) |
| 147 server.quit() | 149 server.quit() |
| 156 errorStr = e[1] | 158 errorStr = e[1] |
| 157 except TypeError: | 159 except TypeError: |
| 158 errorStr = str(e) | 160 errorStr = str(e) |
| 159 else: | 161 else: |
| 160 errorStr = str(e) | 162 errorStr = str(e) |
| 161 E5MessageBox.critical(self, | 163 E5MessageBox.critical( |
| 164 self, | |
| 162 self.trUtf8("Login Test"), | 165 self.trUtf8("Login Test"), |
| 163 self.trUtf8("""<p>The login test failed.<br>Reason: {0}</p>""") | 166 self.trUtf8("""<p>The login test failed.<br>Reason: {0}</p>""") |
| 164 .format(errorStr)) | 167 .format(errorStr)) |
| 165 | 168 |
| 166 | 169 |
