From 45c434799f4e16885cce9aa237777443b5c0c0c3 Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Mon, 28 Aug 2017 21:34:17 +0200 Subject: [PATCH] Rename indent -> column. --- parso/python/tree.py | 4 ++-- parso/tree.py | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/parso/python/tree.py b/parso/python/tree.py index de5176e..581f230 100644 --- a/parso/python/tree.py +++ b/parso/python/tree.py @@ -125,7 +125,7 @@ class _LeafWithoutNewlines(PythonLeaf): @property def end_pos(self): - return self.line, self.indent + len(self.value) + return self.line, self.column + len(self.value) # Python base classes @@ -170,7 +170,7 @@ class Name(_LeafWithoutNewlines): def __repr__(self): return "<%s: %s@%s,%s>" % (type(self).__name__, self.value, - self.line, self.indent) + self.line, self.column) def is_definition(self): if self.parent.type in ('power', 'atom_expr'): diff --git a/parso/tree.py b/parso/tree.py index a5404e2..9dbce25 100644 --- a/parso/tree.py +++ b/parso/tree.py @@ -155,7 +155,7 @@ class NodeOrLeaf(object): class Leaf(NodeOrLeaf): - __slots__ = ('value', 'parent', 'line', 'indent', 'prefix') + __slots__ = ('value', 'parent', 'line', 'column', 'prefix') def __init__(self, value, start_pos, prefix=''): self.value = value @@ -165,12 +165,12 @@ class Leaf(NodeOrLeaf): @property def start_pos(self): - return self.line, self.indent + return self.line, self.column @start_pos.setter def start_pos(self, value): self.line = value[0] - self.indent = value[1] + self.column = value[1] def get_start_pos_of_prefix(self): previous_leaf = self.get_previous_leaf() @@ -196,10 +196,10 @@ class Leaf(NodeOrLeaf): end_pos_line = self.line + len(lines) - 1 # Check for multiline token if self.line == end_pos_line: - end_pos_indent = self.indent + len(lines[-1]) + end_pos_column = self.column + len(lines[-1]) else: - end_pos_indent = len(lines[-1]) - return end_pos_line, end_pos_indent + end_pos_column = len(lines[-1]) + return end_pos_line, end_pos_column @utf8_repr def __repr__(self):