Move the docstring checking code to the names

jedi/api/classes.py

@@ -742,9 +742,6 @@ class _Help(object):
 
     @memoize_method
     def _get_values(self, fast):
-        if isinstance(self._name, ImportName) and fast:
-            return {}
-
         if self._name.api_type == 'statement':
             return {}
 
@@ -756,29 +753,6 @@ class _Help(object):
 
         See :attr:`doc` for example.
         """
-        full_doc = ''
-        # Using the first docstring that we see.
-        for value in self._get_values(fast=fast):
-            if full_doc:
-                # In case we have multiple values, just return all of them
-                # separated by a few dashes.
-                full_doc += '\n' + '-' * 30 + '\n'
-
-            doc = value.py__doc__()
-
-            signature_text = ''
-            if self._name.is_value_name:
-                if not raw:
-                    signature_text = _format_signatures(value)
-                if not doc and value.is_stub():
-                    for c in convert_values(ValueSet({value}), ignore_compiled=False):
-                        doc = c.py__doc__()
-                        if doc:
-                            break
-
-            if signature_text and doc:
-                full_doc += signature_text + '\n\n' + doc
-            else:
-                full_doc += signature_text + doc
-
-        return full_doc
+        if isinstance(self._name, ImportName) and fast:
+            return ''
+        return self._name.py__doc__(include_signatures=not raw)

jedi/api/keywords.py

@@ -15,41 +15,11 @@ except ImportError:
         pydoc_topics = None
 
 
-def get_operator(inference_state, string, pos):
-    return Keyword(inference_state, string, pos)
-
-
 class KeywordName(AbstractArbitraryName):
     api_type = u'keyword'
 
-    def infer(self):
-        return [Keyword(self.inference_state, self.string_name, (0, 0))]
-
-
-class Keyword(object):
-    api_type = u'keyword'
-
-    def __init__(self, inference_state, name, pos):
-        self.name = KeywordName(inference_state, name)
-        self.start_pos = pos
-        self.parent = inference_state.builtins_module
-
-    @property
-    def names(self):
-        """ For a `parsing.Name` like comparision """
-        return [self.name]
-
-    def py__doc__(self):
-        return imitate_pydoc(self.name.string_name)
-
-    def get_signatures(self):
-        # TODO this makes no sense, I think Keyword should somehow merge with
-        #   Value to make it easier for the api/classes.py to deal with all
-        #   of it.
-        return []
-
-    def __repr__(self):
-        return '<%s: %s>' % (type(self).__name__, self.name)
+    def py__doc__(self, include_signatures=False):
+        return imitate_pydoc(self.string_name)
 
 
 def imitate_pydoc(string):