Don't put the introspected argstr in the docstring if the firstline

appears to have one already.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24661 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/wxPython/wx/py/introspect.py b/wxPython/wx/py/introspect.py
index 3bdff3a460f23f0af0021e3af319532511ec01d5..a6df887ea21f05d576be01223aa98e7358aad3bc 100644 (file)
--- a/wxPython/wx/py/introspect.py
+++ b/wxPython/wx/py/introspect.py
@@ -169,6 +169,8 @@ def getCallTip(command='', locals=None):
             temp = argspec.split(',')
             if len(temp) == 1:  # No other arguments.
                 argspec = '()'
             temp = argspec.split(',')
             if len(temp) == 1:  # No other arguments.
                 argspec = '()'

+            elif temp[0][:2] == '(*': # first param is like *args, not self
+                pass 

             else:  # Drop the first argument.
                 argspec = '(' + ','.join(temp[1:]).lstrip()
         tip1 = name + argspec
             else:  # Drop the first argument.
                 argspec = '(' + ','.join(temp[1:]).lstrip()
         tip1 = name + argspec


@@ -184,7 +186,7 @@ def getCallTip(command='', locals=None):
         # tip3 is the rest of the docstring, like:
         # "The call tip information will be based on ... <snip>
         firstline = doc.split('\n')[0].lstrip()
         # tip3 is the rest of the docstring, like:
         # "The call tip information will be based on ... <snip>
         firstline = doc.split('\n')[0].lstrip()

-        if tip1 == firstline:
+        if tip1 == firstline or firstline[:len(name)+1] == name+'(':

             tip1 = ''
         else:
             tip1 += '\n\n'
             tip1 = ''
         else:
             tip1 += '\n\n'