From bf5a4b7c2cb6cf004acb16caa8e36dc2d012dd43 Mon Sep 17 00:00:00 2001 From: Jonas Tranberg Date: Wed, 11 Apr 2018 15:52:35 +0200 Subject: [PATCH 1/2] Added path param to load_grammar for loading custom grammar files --- parso/grammar.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/parso/grammar.py b/parso/grammar.py index c825b55..6c13f00 100644 --- a/parso/grammar.py +++ b/parso/grammar.py @@ -20,7 +20,7 @@ class Grammar(object): """ :py:func:`parso.load_grammar` returns instances of this class. - Creating custom grammars by calling this is not supported, yet. + Creating custom none-python grammars by calling this is not supported, yet. """ #:param text: A BNF representation of your grammar. _error_normalizer_config = None @@ -219,12 +219,13 @@ def load_grammar(**kwargs): version. :param str version: A python version string, e.g. ``version='3.3'``. + :param str path: A path to a grammar file """ - def load_grammar(language='python', version=None): + def load_grammar(language='python', version=None, path=None): if language == 'python': version_info = parse_version_string(version) - file = os.path.join( + file = path or os.path.join( 'python', 'grammar%s%s.txt' % (version_info.major, version_info.minor) ) From f4912f6c17e37bb6ebc67728ca97ad93dfe00893 Mon Sep 17 00:00:00 2001 From: Aaron Meurer Date: Fri, 16 Feb 2018 00:54:07 -0500 Subject: [PATCH 2/2] Use the correct field name in the PythonToken repr --- parso/python/tokenize.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/parso/python/tokenize.py b/parso/python/tokenize.py index 31f081d..d8d2faf 100644 --- a/parso/python/tokenize.py +++ b/parso/python/tokenize.py @@ -244,7 +244,7 @@ class PythonToken(Token): return tok_name[self.type] def __repr__(self): - return ('TokenInfo(type=%s, string=%r, start=%r, prefix=%r)' % + return ('TokenInfo(type=%s, string=%r, start_pos=%r, prefix=%r)' % self._replace(type=self._get_type_name()))