Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EmailPage.py	Thu Feb 28 18:02:16 2019 +0100
+++ b/Preferences/ConfigurationPages/EmailPage.py	Sat Mar 02 11:12:25 2019 +0100
@@ -38,6 +38,13 @@
         
         self.__helpDialog = None
         
+        pipPackages = [
+            "google-api-python-client",
+            "google-auth-oauthlib",
+        ]
+        self.__pipCommand = "pip install --upgrade {0}".format(
+            " ".join(pipPackages))
+        
         # set initial values
         try:
             import googleapiclient      # __IGNORE_WARNING__
@@ -55,17 +62,12 @@
                 Preferences.setUser("UseGoogleMailOAuth2", False)
         except ImportError:
             # missing libraries, disable Google Mail
-            pipPackages = [
-                "google-api-python-client",
-                "google-auth-oauthlib",
-            ]
-            pipCommand = "pip install --upgrade {0}".format(
-                " ".join(pipPackages))
             self.googleMailCheckBox.setChecked(False)
             self.googleMailCheckBox.setEnabled(False)
             self.googleMailInfoLabel.setText(self.tr(
                 "<p>The Google Mail Client API is not installed."
-                " Use <code>{0}</code> to install it.</p>").format(pipCommand))
+                " Use <code>{0}</code> to install it.</p>")
+                .format(self.__pipCommand))
             self.googleHelpButton.setEnabled(False)
             Preferences.setUser("UseGoogleMailOAuth2", False)
         
@@ -288,10 +290,10 @@
                 from E5Network.E5GoogleMail import GoogleMailHelp
                 helpStr = GoogleMailHelp()
             except ImportError:
-                helpStr = self.tr(
-                    "<p>The Google Mail Client API is not installed."
-                    " Use <code>pip install --upgrade google-api-python-client"
-                    "</code> to install it.</p>")
+                    helpStr = self.tr(
+                        "<p>The Google Mail Client API is not installed."
+                        " Use <code>{0}</code> to install it.</p>"
+                    ).format(self.__pipCommand)
             
             from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
             self.__helpDialog = E5SimpleHelpDialog(