Use __str__ instead of to_string

This commit is contained in:
Dave Halter
2019-07-31 00:00:37 +02:00
parent 75f654b944
commit 1151700114
5 changed files with 17 additions and 15 deletions
+3 -4
View File
@@ -531,7 +531,7 @@ class Definition(BaseDefinition):
typ = self.type
tree_name = self._name.tree_name
if typ == 'param':
return typ + ' ' + self._name.to_string()
return typ + ' ' + str(self._name)
if typ in ('function', 'class', 'module', 'instance') or tree_name is None:
if typ == 'function':
# For the description we want a short and a pythonic way.
@@ -633,14 +633,13 @@ class CallSignature(Definition):
return '<%s: index=%r %s>' % (
type(self).__name__,
self.index,
self._signature.to_string(),
self._signature,
)
def _format_signatures(context):
return '\n'.join(
signature.to_string()
for signature in context.get_signatures()
str(signature) for signature in context.get_signatures()
)
+2 -2
View File
@@ -309,7 +309,7 @@ class SignatureParamName(ParamNameInterface, AbstractNameDefinition):
def string_name(self):
return self._signature_param.name
def to_string(self):
def __str__(self):
s = self._kind_string() + self.string_name
if self._signature_param.has_annotation:
s += ': ' + self._signature_param.annotation_string
@@ -341,7 +341,7 @@ class UnresolvableParamName(ParamNameInterface, AbstractNameDefinition):
def get_kind(self):
return Parameter.POSITIONAL_ONLY
def to_string(self):
def __str__(self):
string = self.string_name
if self._default:
string += '=' + self._default
+5 -2
View File
@@ -178,7 +178,7 @@ class ParamNameInterface(_ParamMixin):
def get_kind(self):
raise NotImplementedError
def to_string(self):
def __str__(self):
raise NotImplementedError
def get_param(self):
@@ -201,7 +201,7 @@ class BaseTreeParamName(ParamNameInterface, AbstractTreeName):
annotation_node = None
default_node = None
def to_string(self):
def __str__(self):
output = self._kind_string() + self.string_name
annotation = self.annotation_node
default = self.default_node
@@ -277,6 +277,9 @@ class ParamNameWrapper(_ParamMixin):
def __getattr__(self, name):
return getattr(self._wrapped_param_name, name)
def __str__(self):
return str(self._wrapped_param_name)
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self._wrapped_param_name)
+2 -2
View File
@@ -2,7 +2,7 @@ from jedi._compatibility import Parameter
class _SignatureMixin(object):
def to_string(self):
def __str__(self):
def param_strings():
is_positional = False
is_kw_only = False
@@ -19,7 +19,7 @@ class _SignatureMixin(object):
yield '*'
is_kw_only = True
yield n.to_string()
yield str(n)
if is_positional:
yield '/'