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

resolved merge conflict

Browse Source
This commit is contained in:
David Halter
2012-12-27 19:49:30 +01:00
parent 3f90055c69 fc1d075a7c
commit 596d0fdf77
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jedi/api_classes.py
View File

@@ -93,8 +93,8 @@ class BaseDefinition(object):
@property @property
def line_nr(self): def line_nr(self):
""" """
.. warning:: Deprecated! It's just here for backwards compatibility, .. deprecated:: 0.5.0
use `api_classes.BaseDefinition.line` instead. Use :attr:`.line` instead.
.. todo:: Remove! .. todo:: Remove!
""" """
warnings.warn("Use line instead.", DeprecationWarning) warnings.warn("Use line instead.", DeprecationWarning)
@@ -102,7 +102,7 @@ class BaseDefinition(object):
@property @property
def line(self): def line(self):
""" The line where the definition occurs (starting with 1). """ """The line where the definition occurs (starting with 1)."""
return self.start_pos[0] return self.start_pos[0]
@property @property
@@ -112,7 +112,7 @@ class BaseDefinition(object):
@property @property
def doc(self): def doc(self):
""" Return a document string for this completion object. """ """Return a document string for this completion object."""
try: try:
return self.definition.doc return self.definition.doc
except AttributeError: except AttributeError: