diff --git a/python/helpers/pydev/_pydev_bundle/_pydev_imports_tipper.py b/python/helpers/pydev/_pydev_bundle/_pydev_imports_tipper.py
index ac1c98233604..8169e1b18244 100644
--- a/python/helpers/pydev/_pydev_bundle/_pydev_imports_tipper.py
+++ b/python/helpers/pydev/_pydev_bundle/_pydev_imports_tipper.py
@@ -3,6 +3,16 @@ import os.path
 import sys
 
 from _pydev_bundle._pydev_tipper_common import do_find
+from _pydevd_bundle.pydevd_constants import IS_PY2
+
+if IS_PY2:
+    from inspect import getargspec
+else:
+    from inspect import getfullargspec
+
+    def getargspec(*args, **kwargs):
+        arg_spec = getfullargspec(*args, **kwargs)
+        return arg_spec.args, arg_spec.varargs, arg_spec.varkw, arg_spec.defaults
 
 try:
     xrange
@@ -212,7 +222,7 @@ def generate_imports_tip_for_module(obj_to_complete, dir_comps=None, getattr=get
 
                     if inspect.ismethod(obj) or inspect.isbuiltin(obj) or inspect.isfunction(obj) or inspect.isroutine(obj):
                         try:
-                            args, vargs, kwargs, defaults = inspect.getargspec(obj)
+                            args, vargs, kwargs, defaults = getargspec(obj)
 
                             r = ''
                             for a in (args):