From 968ce4759a9ea0437b1138ccb35fd801797cbe0b Mon Sep 17 00:00:00 2001 From: Dave Halter Date: Sat, 8 Jul 2017 19:00:03 +0200 Subject: [PATCH] Move some stuff around to make it more flexible. --- parso/normalizer.py | 9 +++++++++ parso/python/normalizer.py | 2 +- parso/tree.py | 15 +++------------ 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/parso/normalizer.py b/parso/normalizer.py index e7262c3..0f0ef11 100644 --- a/parso/normalizer.py +++ b/parso/normalizer.py @@ -7,6 +7,15 @@ class Normalizer(object): self._config = config self.issues = [] + def visit(self, node): + try: + children = node.children + except AttributeError: + return self.visit_leaf(node) + else: + with self.visit_node(node): + return ''.join(self.visit(child) for child in children) + @contextmanager def visit_node(self): yield diff --git a/parso/python/normalizer.py b/parso/python/normalizer.py index f492e58..14ab030 100644 --- a/parso/python/normalizer.py +++ b/parso/python/normalizer.py @@ -347,7 +347,7 @@ class PEP8Normalizer(Normalizer): self._newline_count = 0 - def normalize(self, leaf): + def visit_leaf(self, leaf): for part in leaf._split_prefix(): if part.type == 'spacing': # This part is used for the part call after for. diff --git a/parso/tree.py b/parso/tree.py index 2a31ccf..eb5bb8e 100644 --- a/parso/tree.py +++ b/parso/tree.py @@ -162,26 +162,17 @@ class NodeOrLeaf(object): "there's no default normalizer for this tree.") return normalizer_config.create_normalizer() - def _will_be_normalize(self, normalizer_config=None): + def _normalize(self, normalizer_config=None): """ TODO this is not public, yet. The returned code will be normalized, e.g. PEP8 for Python. """ normalizer = self._get_normalizer(normalizer_config) - return self._normalize(normalizer) - - def _normalize(self, normalizer): - try: - children = self.children - except AttributeError: - return normalizer.normalize(self) - else: - with normalizer.visit_node(self): - return ''.join(child._normalize(normalizer) for child in children) + return normalizer.visit(self) def _get_normalizer_issues(self, normalizer_config=None): normalizer = self._get_normalizer(normalizer_config) - self._normalize(normalizer) + normalizer.visit(self) return normalizer.issues