VimPlug/jedi-fork
1
0
Fork 0
forked from VimPlug/jedi
Code Pull Requests Activity

__class__ -> type

Browse Source
This commit is contained in:
David Halter
2012-10-01 08:50:12 +02:00
parent 61f465a7d6
commit eda2430ad7
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jedi/api.py
View File

@@ -65,7 +65,7 @@ class Completion(object):
return type(self.name.parent())
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.name)
return '<%s: %s>' % (type(self).__name__, self.name)
class Definition(dynamic.BaseOutput):
@@ -150,7 +150,7 @@ class CallDef(object):
return self.executable.get_parent_until()
def __repr__(self):
return '<%s: %s index %s>' % (self.__class__.__name__, self.executable,
return '<%s: %s index %s>' % (type(self).__name__, self.executable,
self.index)

2
jedi/dynamic.py
View File

@@ -467,7 +467,7 @@ class BaseOutput(object):
raise NotImplementedError('Base Class')
def __repr__(self):
return "<%s %s>" % (self.__class__.__name__, self.description)
return "<%s %s>" % (type(self).__name__, self.description)
class RelatedName(BaseOutput):

16
jedi/evaluate.py
View File

@@ -271,7 +271,7 @@ class Instance(use_metaclass(CachedMetaClass, Executable)):
def __repr__(self):
return "<e%s of %s (var_args: %s)>" % \
(self.__class__.__name__, self.base, len(self.var_args or []))
(type(self).__name__, self.base, len(self.var_args or []))
class InstanceElement(use_metaclass(CachedMetaClass)):
@@ -328,7 +328,7 @@ class InstanceElement(use_metaclass(CachedMetaClass)):
return isinstance(self.var, cls)
def __repr__(self):
return "<%s of %s>" % (self.__class__.__name__, self.var)
return "<%s of %s>" % (type(self).__name__, self.var)
class Class(use_metaclass(CachedMetaClass, parsing.Base)):
@@ -391,7 +391,7 @@ class Class(use_metaclass(CachedMetaClass, parsing.Base)):
return getattr(self.base, name)
def __repr__(self):
return "<e%s of %s>" % (self.__class__.__name__, self.base)
return "<e%s of %s>" % (type(self).__name__, self.base)
class Function(use_metaclass(CachedMetaClass, parsing.Base)):
@@ -460,7 +460,7 @@ class Function(use_metaclass(CachedMetaClass, parsing.Base)):
dec = ''
if self._decorated_func != self.base_func:
dec = " is " + repr(self._decorated_func)
return "<e%s of %s%s>" % (self.__class__.__name__, self.base_func, dec)
return "<e%s of %s%s>" % (type(self).__name__, self.base_func, dec)
class Execution(Executable):
@@ -748,7 +748,7 @@ class Execution(Executable):
def __repr__(self):
return "<%s of %s>" % \
(self.__class__.__name__, self.base)
(type(self).__name__, self.base)
class Generator(use_metaclass(CachedMetaClass, parsing.Base)):
@@ -786,7 +786,7 @@ class Generator(use_metaclass(CachedMetaClass, parsing.Base)):
return self.func.parent()
def __repr__(self):
return "<%s of %s>" % (self.__class__.__name__, self.func)
return "<%s of %s>" % (type(self).__name__, self.func)
class Array(use_metaclass(CachedMetaClass, parsing.Base)):
@@ -880,7 +880,7 @@ class Array(use_metaclass(CachedMetaClass, parsing.Base)):
return getattr(self._array, name)
def __repr__(self):
return "<e%s of %s>" % (self.__class__.__name__, self._array)
return "<e%s of %s>" % (type(self).__name__, self._array)
class ArrayElement(object):
@@ -898,7 +898,7 @@ class ArrayElement(object):
return getattr(self.name, name)
def __repr__(self):
return "<%s of %s>" % (self.__class__.__name__, self.name)
return "<%s of %s>" % (type(self).__name__, self.name)
def get_defined_names_for_position(scope, position=None, start_scope=None):

2
jedi/imports.py
View File

@@ -53,7 +53,7 @@ class ImportPath(object):
self.import_path.pop()
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.import_stmt)
return '<%s: %s>' % (type(self).__name__, self.import_stmt)
def is_nested_import(self):
"""

2
jedi/keywords.py
View File

@@ -51,7 +51,7 @@ class Keyword(object):
return imitate_pydoc(self.name)
def __repr__(self):
return '<%s: %s>' % (self.__class__.__name__, self.name)
return '<%s: %s>' % (type(self).__name__, self.name)
def imitate_pydoc(string):

20
jedi/parsing.py
View File

@@ -117,7 +117,7 @@ class Simple(Base):
def __repr__(self):
code = self.get_code().replace('\n', ' ')
return "<%s: %s@%s>" % \
(self.__class__.__name__, code, self.start_pos[0])
(type(self).__name__, code, self.start_pos[0])
class Scope(Simple):
@@ -255,7 +255,7 @@ class Scope(Simple):
except AttributeError:
name = self.path
return "<%s: %s@%s-%s>" % (self.__class__.__name__, name,
return "<%s: %s@%s-%s>" % (type(self).__name__, name,
self.start_pos[0], self.end_pos[0])
@@ -726,7 +726,7 @@ class Statement(Simple):
continue
brackets = {'(': Array.TUPLE, '[': Array.LIST, '{': Array.SET}
is_call = lambda: result.__class__ == Call
is_call = lambda: type(result) == Call
is_call_or_close = lambda: is_call() or close_brackets
is_literal = token_type in [tokenize.STRING, tokenize.NUMBER]
@@ -748,7 +748,7 @@ class Statement(Simple):
if close_brackets:
result = result.parent()
close_brackets = False
if result.__class__ == Call:
if type(result) == Call:
result = result.parent()
close_brackets = False
call = Call(tok, c_type, start_pos, parent=result)
@@ -921,7 +921,7 @@ class Call(Base):
def __repr__(self):
return "<%s: %s>" % \
(self.__class__.__name__, self.name)
(type(self).__name__, self.name)
class Array(Call):
@@ -1041,10 +1041,10 @@ class Array(Call):
def __repr__(self):
if self.type == self.NOARRAY:
type = 'noarray'
typ = 'noarray'
else:
type = self.type
return "<%s: %s%s>" % (self.__class__.__name__, type, self.values)
typ = self.type
return "<%s: %s%s>" % (type(self).__name__, typ, self.values)
class NamePart(str):
@@ -1096,7 +1096,7 @@ class ListComprehension(object):
def __repr__(self):
return "<%s: %s>" % \
(self.__class__.__name__, self.get_code())
(type(self).__name__, self.get_code())
def get_code(self):
statements = self.stmt, self.middle, self.input
@@ -1139,7 +1139,7 @@ class PyFuzzyParser(object):
del self.code
def __repr__(self):
return "<%s: %s>" % (self.__class__.__name__, self.module)
return "<%s: %s>" % (type(self).__name__, self.module)
@property
def start_pos(self):