Mercurial Repositories > eric / changeset

--- a/E5Gui/E5SimpleHelpDialog.py	Wed Jul 05 19:38:06 2017 +0200
+++ b/E5Gui/E5SimpleHelpDialog.py	Wed Jul 05 19:40:18 2017 +0200
@@ -19,7 +19,7 @@
     """
     Class implementing a dialog to show some help text.
     """
-    def __init__(self, title="", label="", help="", parent=None):
+    def __init__(self, title="", label="", helpStr="", parent=None):
         """
         Constructor
         
@@ -27,7 +27,7 @@
         @type str
         @param label label for the help
         @type str
-        @param help HTML help text
+        @param helpStr HTML help text
         @type str
         @param parent reference to the parent widget
         @type QWidget
@@ -41,4 +41,4 @@
             self.helpLabel.setText(label)
         else:
             self.helpLabel.hide()
-        self.helpEdit.setHtml(help)
+        self.helpEdit.setHtml(helpStr)

--- a/UI/EmailDialog.py	Wed Jul 05 19:38:06 2017 +0200
+++ b/UI/EmailDialog.py	Wed Jul 05 19:40:18 2017 +0200
@@ -166,9 +166,9 @@
         if self.__helpDialog is None:
             try:
                 from E5Network.E5GoogleMail import GoogleMailHelp
-                help = GoogleMailHelp()
+                helpStr = GoogleMailHelp()
             except ImportError:
-                help = self.tr(
+                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>")
@@ -176,7 +176,7 @@
             from E5Gui.E5SimpleHelpDialog import E5SimpleHelpDialog
             self.__helpDialog = E5SimpleHelpDialog(
                 title=self.tr("Gmail API Help"),
-                help=help, parent=self)
+                helpStr=helpStr, parent=self)
         
         self.__helpDialog.show()
     
@@ -393,12 +393,11 @@
                 return False
         return True
     
-
     def __sendmailGoogle(self, msg):
         """
         Private method to actually send the message via Google Mail.
         
-        @param message email message to be sent
+        @param msg email message to be sent
         @type email.mime.text.MIMEBase
         @return flag indicating success
         @rtype bool