eric: comparison src/eric7/Preferences/ConfigurationPages/EmailPage.py

-:e9e7eca7efee
+:bf71ee032bb4
 from EricWidgets import EricMessageBox
 from EricWidgets.EricApplication import ericApp
 from EricGui.EricOverrideCursor import EricOverrideCursor
-from EricNetwork.EricGoogleMailHelpers import (
+from EricNetwork.EricGoogleMailHelpers import getInstallCommand, RequiredPackages
-getInstallCommand, RequiredPackages
-)
 from .ConfigurationPageBase import ConfigurationPageBase
 from .Ui_EmailPage import Ui_EmailPage
 import Globals
 class EmailPage(ConfigurationPageBase, Ui_EmailPage):
 """
 Class implementing the Email configuration page.
 """
 def __init__(self):
 """
 Constructor
 """
 super().__init__()
 self.setupUi(self)
 self.setObjectName("EmailPage")
 self.__helpDialog = None
 pipPackages = [
 "google-api-python-client",
 "google-auth-oauthlib",
 ]
-self.__pipCommand = "pip install --upgrade {0}".format(
+self.__pipCommand = "pip install --upgrade {0}".format(" ".join(pipPackages))
-" ".join(pipPackages))
 # set initial values
 self.__checkGoogleMail()
 self.mailServerEdit.setText(Preferences.getUser("MailServer"))
 self.portSpin.setValue(Preferences.getUser("MailServerPort"))
 self.emailEdit.setText(Preferences.getUser("Email"))
 self.signatureEdit.setPlainText(Preferences.getUser("Signature"))
 self.mailAuthenticationGroup.setChecked(
-Preferences.getUser("MailServerAuthentication"))
+Preferences.getUser("MailServerAuthentication")
+)
 self.mailUserEdit.setText(Preferences.getUser("MailServerUser"))
-self.mailPasswordEdit.setText(
+self.mailPasswordEdit.setText(Preferences.getUser("MailServerPassword"))
-Preferences.getUser("MailServerPassword"))
 encryption = Preferences.getUser("MailServerEncryption")
 if encryption == "TLS":
 self.useTlsButton.setChecked(True)
 elif encryption == "SSL":
 self.useSslButton.setChecked(True)
 else:
 self.noEncryptionButton.setChecked(True)
 def save(self):
 """
 Public slot to save the Email configuration.
 """
+Preferences.setUser("UseGoogleMailOAuth2", self.googleMailCheckBox.isChecked())
+Preferences.setUser("MailServer", self.mailServerEdit.text())
+Preferences.setUser("MailServerPort", self.portSpin.value())
+Preferences.setUser("Email", self.emailEdit.text())
+Preferences.setUser("Signature", self.signatureEdit.toPlainText())
 Preferences.setUser(
-"UseGoogleMailOAuth2",
+"MailServerAuthentication", self.mailAuthenticationGroup.isChecked()
-self.googleMailCheckBox.isChecked())
+)
-Preferences.setUser(
+Preferences.setUser("MailServerUser", self.mailUserEdit.text())
-"MailServer",
+Preferences.setUser("MailServerPassword", self.mailPasswordEdit.text())
-self.mailServerEdit.text())
-Preferences.setUser(
-"MailServerPort",
-self.portSpin.value())
-Preferences.setUser(
-"Email",
-self.emailEdit.text())
-Preferences.setUser(
-"Signature",
-self.signatureEdit.toPlainText())
-Preferences.setUser(
-"MailServerAuthentication",
-self.mailAuthenticationGroup.isChecked())
-Preferences.setUser(
-"MailServerUser",
-self.mailUserEdit.text())
-Preferences.setUser(
-"MailServerPassword",
-self.mailPasswordEdit.text())
 if self.useTlsButton.isChecked():
 encryption = "TLS"
 elif self.useSslButton.isChecked():
 encryption = "SSL"
 else:
 encryption = "No"
 Preferences.setUser("MailServerEncryption", encryption)
 def __updatePortSpin(self):
 """
 Private slot to set the value of the port spin box depending upon
 the selected encryption method.
 """
 self.portSpin.setValue(465)
 elif self.useTlsButton.isChecked():
 self.portSpin.setValue(587)
 else:
 self.portSpin.setValue(25)
 @pyqtSlot(bool)
 def on_noEncryptionButton_toggled(self, checked):
 """
 Private slot handling a change of no encryption button.
 @param checked current state of the button
 @type bool
 """
 self.__updatePortSpin()
 @pyqtSlot(bool)
 def on_useSslButton_toggled(self, checked):
 """
 Private slot handling a change of SSL encryption button.
 @param checked current state of the button
 @type bool
 """
 self.__updatePortSpin()
 @pyqtSlot(bool)
 def on_useTlsButton_toggled(self, checked):
 """
 Private slot handling a change of TLS encryption button.
 @param checked current state of the button
 @type bool
 """
 self.__updatePortSpin()
 def __updateTestButton(self):
 """
 Private slot to update the enabled state of the test button.
 """
 self.testButton.setEnabled(
-self.mailAuthenticationGroup.isChecked() and
+self.mailAuthenticationGroup.isChecked()
-self.mailUserEdit.text() != "" and
+and self.mailUserEdit.text() != ""
-self.mailPasswordEdit.text() != "" and
+and self.mailPasswordEdit.text() != ""
-self.mailServerEdit.text() != ""
+and self.mailServerEdit.text() != ""
 )
 @pyqtSlot(str)
 def on_mailServerEdit_textChanged(self, txt):
 """
 Private slot to handle a change of the text of the mail server edit.
 @param txt current text of the edit (string)
 @type str
 """
 self.__updateTestButton()
 @pyqtSlot(bool)
 def on_mailAuthenticationGroup_toggled(self, checked):
 """
 Private slot to handle a change of the state of the authentication
 group.
 @param checked state of the group (boolean)
 """
 self.__updateTestButton()
 @pyqtSlot(str)
 def on_mailUserEdit_textChanged(self, txt):
 """
 Private slot to handle a change of the text of the user edit.
 @param txt current text of the edit (string)
 """
 self.__updateTestButton()
 @pyqtSlot(str)
 def on_mailPasswordEdit_textChanged(self, txt):
 """
 Private slot to handle a change of the text of the user edit.
 @param txt current text of the edit (string)
 """
 self.__updateTestButton()
 @pyqtSlot()
 def on_testButton_clicked(self):
 """
 Private slot to test the mail server login data.
 """
 try:
 with EricOverrideCursor():
 if self.useSslButton.isChecked():
-server = smtplib.SMTP_SSL(self.mailServerEdit.text(),
+server = smtplib.SMTP_SSL(
-self.portSpin.value(),
+self.mailServerEdit.text(), self.portSpin.value(), timeout=10
-timeout=10)
+)
 else:
-server = smtplib.SMTP(self.mailServerEdit.text(),
+server = smtplib.SMTP(
-self.portSpin.value(),
+self.mailServerEdit.text(), self.portSpin.value(), timeout=10
-timeout=10)
+)
 if self.useTlsButton.isChecked():
 server.starttls()
-server.login(self.mailUserEdit.text(),
+server.login(self.mailUserEdit.text(), self.mailPasswordEdit.text())
-self.mailPasswordEdit.text())
 server.quit()
 EricMessageBox.information(
-self,
+self, self.tr("Login Test"), self.tr("""The login test succeeded.""")
-self.tr("Login Test"),
+)
-self.tr("""The login test succeeded."""))
 except (smtplib.SMTPException, OSError) as e:
 if isinstance(e, smtplib.SMTPResponseException):
 errorStr = e.smtp_error.decode()
 elif isinstance(e, socket.timeout):
 errorStr = str(e)
 else:
 errorStr = str(e)
 EricMessageBox.critical(
 self,
 self.tr("Login Test"),
-self.tr(
+self.tr("""<p>The login test failed.<br>Reason: {0}</p>""").format(
-"""<p>The login test failed.<br>Reason: {0}</p>""")
+errorStr
-.format(errorStr))
+),
+)
 @pyqtSlot()
 def on_googleHelpButton_clicked(self):
 """
 Private slot to show some help text "how to turn on the Gmail API".
 """
 if self.__helpDialog is None:
 try:
 from EricNetwork.EricGoogleMail import GoogleMailHelp
 helpStr = GoogleMailHelp()
 except ImportError:
 helpStr = self.tr(
 "<p>The Google Mail Client API is not installed."
 " Use <code>{0}</code> to install it.</p>"
 ).format(getInstallCommand())
 from EricWidgets.EricSimpleHelpDialog import EricSimpleHelpDialog
 self.__helpDialog = EricSimpleHelpDialog(
-title=self.tr("Gmail API Help"),
+title=self.tr("Gmail API Help"), helpStr=helpStr, parent=self
-helpStr=helpStr, parent=self)
+)
 self.__helpDialog.show()
 @pyqtSlot()
 def on_googleInstallButton_clicked(self):
 """
 Private slot to install the required packages for use of Google Mail.
 """
 pip = ericApp().getObject("Pip")
-pip.installPackages(RequiredPackages,
+pip.installPackages(RequiredPackages, interpreter=Globals.getPythonExecutable())
-interpreter=Globals.getPythonExecutable())
 self.__checkGoogleMail()
 @pyqtSlot()
 def on_googleCheckAgainButton_clicked(self):
 """
 Private slot to check again the availability of Google Mail.
 """
 self.__checkGoogleMail()
 def __checkGoogleMail(self):
 """
 Private method to check the Google Mail availability and set the
 widgets accordingly.
 """
 self.googleMailInfoLabel.hide()
 self.googleInstallButton.show()
 self.googleCheckAgainButton.show()
 self.googleHelpButton.setEnabled(True)
 self.googleMailCheckBox.setEnabled(True)
 try:
-import EricNetwork.EricGoogleMail      # __IGNORE_WARNING__
+import EricNetwork.EricGoogleMail  # __IGNORE_WARNING__
-from EricNetwork.EricGoogleMailHelpers import (
+from EricNetwork.EricGoogleMailHelpers import isClientSecretFileAvailable
-isClientSecretFileAvailable
-)
 self.googleInstallButton.hide()
 if not isClientSecretFileAvailable():
 # secrets file is not installed
 self.googleMailCheckBox.setChecked(False)
 self.googleMailCheckBox.setEnabled(False)
-self.googleMailInfoLabel.setText(self.tr(
+self.googleMailInfoLabel.setText(
-"<p>The client secrets file is not present."
+self.tr(
-" Has the Gmail API been enabled?</p>"))
+"<p>The client secrets file is not present."
+" Has the Gmail API been enabled?</p>"
+)
+)
 self.googleMailInfoLabel.show()
 Preferences.setUser("UseGoogleMailOAuth2", False)
 else:
 self.googleMailCheckBox.setChecked(
-Preferences.getUser("UseGoogleMailOAuth2"))
+Preferences.getUser("UseGoogleMailOAuth2")
+)
 self.googleMailInfoLabel.hide()
 self.googleCheckAgainButton.hide()
 except ImportError:
 # missing libraries, disable Google Mail
 self.googleMailCheckBox.setChecked(False)
 self.googleMailCheckBox.setEnabled(False)
-self.googleMailInfoLabel.setText(self.tr(
+self.googleMailInfoLabel.setText(
-"<p>The Google Mail Client API is not installed."
+self.tr(
-" Use <code>{0}</code> to install it.</p>"
+"<p>The Google Mail Client API is not installed."
-).format(getInstallCommand()))
+" Use <code>{0}</code> to install it.</p>"
+).format(getInstallCommand())
+)
 self.googleMailInfoLabel.show()
 self.googleHelpButton.setEnabled(False)
 Preferences.setUser("UseGoogleMailOAuth2", False)
 def create(dlg):
 """
 Module function to create the configuration page.
 @param dlg reference to the configuration dialog
 @return reference to the instantiated page (ConfigurationPageBase)
 """
 page = EmailPage()
 return page

Mercurial Repositories > eric / file comparison

comparison: src/eric7/Preferences/ConfigurationPages/EmailPage.py

src/eric7/Preferences/ConfigurationPages/EmailPage.py