Merge lp:~ufleisch/python-mode/improve-completion into lp:python-mode/components-python-mode

[Andreas Roehler]

completion

[Andreas Roehler (a-roehler)]

Thanks!

review: Approve

=== modified file 'completion/pycomplete.py'
--- completion/pycomplete.py	2015-12-01 08:21:26 +0000
+++ completion/pycomplete.py	2016-01-30 20:35:43 +0000
@@ -654,10 +654,22 @@
             obj = self.get_method_function(obj)
 
         if type(obj) in [types.FunctionType, types.LambdaType]:
-            (args, varargs, varkw, defaults) = inspect.getargspec(obj)
-            sig = ('%s: %s' % (obj.__name__,
-                               inspect.formatargspec(args, varargs, varkw,
-                                                     defaults)))
+            try:
+                (args, varargs, varkw, defaults) = inspect.getargspec(obj)
+                sig = ('%s: %s' % (obj.__name__,
+                                   inspect.formatargspec(args, varargs, varkw,
+                                                         defaults)))
+            except ValueError:
+                try:
+                    (args, varargs, varkw, defaults, kwonlyargs,
+                     kwonlydefaults, annotations) = inspect.getfullargspec(obj)
+                    sig = ('%s: %s' % (
+                        obj.__name__, inspect.formatargspec(
+                            args, varargs, varkw, defaults, kwonlyargs,
+                            kwonlydefaults, annotations)))
+                except AttributeError:
+                    pass
+
         doc = getattr(obj, '__doc__', '')
         if doc and not sig:
             doc = doc.lstrip()

=== modified file 'completion/test_pycomplete.py'
--- completion/test_pycomplete.py	2013-01-05 21:10:33 +0000
+++ completion/test_pycomplete.py	2016-01-30 20:35:43 +0000
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-import os
+import os, sys
 import linecache
 import tempfile
 from pycomplete import *
@@ -19,7 +19,8 @@
            'csv_reader = reader(iterable [, dialect=\'excel\']'
     assert pysignature('super') in (
         'super(type) -> unbound super object',
-        'super() -> same as super(__class__, <first argument>)')
+        'super() -> same as super(__class__, <first argument>)',
+        'super(type, obj) -> bound super object; requires isinstance(obj, type)')
 
 def test_help():
     assert pyhelp('os.path.join').startswith('Help on function join')
@@ -28,7 +29,8 @@
     assert pyhelp('csv', imports=('import csv',)).startswith(
         'Help on module csv:\n\nNAME\n    csv - CSV parsing and writing.\n')
     assert pyhelp('import').startswith(
-        'The ``import`` statement\n************************\n')
+        ('The ``import`` statement\n************************\n',
+         'The "import" statement\n**********************\n'))
     assert pyhelp('pydoc.help').startswith(
         'Help on class Helper in module pydoc')
     assert pyhelp('') == ''
@@ -181,8 +183,9 @@
         assert pycompletions('TestClass._member2.', name) == []
         assert pycompletions('TestClass.__member3.ext', name) == \
           ['extend']
-        assert pycompletions('TestClass.member4.prin', name) == \
-          ['print_help', 'print_usage', 'print_version']
+        if sys.version_info[0] < 3:
+            assert pycompletions('TestClass.member4.prin', name) == \
+              ['print_help', 'print_usage', 'print_version']
         assert pycompletions('TestClass.member5.writel', name) == \
           ['writelines']
         assert pycompletions('TestClass.member6.from', name) == \