From f6b3b1cc24960516ec4712c5ad6c115e0b5e0b99 Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Fri, 14 Jul 2017 18:28:03 +0200
Subject: [PATCH] Make version a keyword only argument in load_grammar.

---
 parso/grammar.py           | 44 ++++++++++++++++++++------------------
 test/test_load_grammar.py  |  8 +++----
 test/test_python_errors.py |  2 +-
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/parso/grammar.py b/parso/grammar.py
index bcbca19..a92faa5 100644
--- a/parso/grammar.py
+++ b/parso/grammar.py
@@ -144,35 +144,37 @@ class PythonGrammar(Grammar):
         return tokenize(code, self._version_int)
 
 
-def load_grammar(version=None):
+def load_grammar(**kwargs):
     """
     Loads a Python grammar. The default version is the current Python version.
 
     If you need support for a specific version, please use e.g.
     `version='3.3'`.
     """
-    version_int = version_string_to_int(version)
+    def load_grammar(version=None):
+        version_int = version_string_to_int(version)
 
-    # For these versions we use the same grammar files, because nothing
-    # changed.
-    if version_int == 33:
-        version_int = 34
-    elif version_int == 26:
-        version_int = 27
+        # For these versions we use the same grammar files, because nothing
+        # changed.
+        if version_int == 33:
+            version_int = 34
+        elif version_int == 26:
+            version_int = 27
 
-    file = 'python/grammar' + str(version_int) + '.txt'
+        file = 'python/grammar' + str(version_int) + '.txt'
 
-    global _loaded_grammars
-    path = os.path.join(os.path.dirname(__file__), file)
-    try:
-        return _loaded_grammars[path]
-    except KeyError:
+        global _loaded_grammars
+        path = os.path.join(os.path.dirname(__file__), file)
         try:
-            with open(path) as f:
-                bnf_text = f.read()
+            return _loaded_grammars[path]
+        except KeyError:
+            try:
+                with open(path) as f:
+                    bnf_text = f.read()
 
-            grammar = PythonGrammar(version_int, bnf_text)
-            return _loaded_grammars.setdefault(path, grammar)
-        except FileNotFoundError:
-            message = "Python version %s is currently not supported." % version
-            raise NotImplementedError(message)
+                grammar = PythonGrammar(version_int, bnf_text)
+                return _loaded_grammars.setdefault(path, grammar)
+            except FileNotFoundError:
+                message = "Python version %s is currently not supported." % version
+                raise NotImplementedError(message)
+    return load_grammar(**kwargs)
diff --git a/test/test_load_grammar.py b/test/test_load_grammar.py
index 147a19e..105dc7a 100644
--- a/test/test_load_grammar.py
+++ b/test/test_load_grammar.py
@@ -6,11 +6,11 @@ from parso import utils
 def test_load_inexisting_grammar():
     # This version shouldn't be out for a while, but if we ever do, wow!
     with pytest.raises(NotImplementedError):
-        load_grammar('15.8')
+        load_grammar(version='15.8')
     # The same is true for very old grammars (even though this is probably not
     # going to be an issue.
     with pytest.raises(NotImplementedError):
-        load_grammar('1.5')
+        load_grammar(version='1.5')
 
 
 @pytest.mark.parametrize(('string', 'result'), [
@@ -23,9 +23,9 @@ def test_parse_version(string, result):
 @pytest.mark.parametrize('string', ['1.', 'a', '#', '1.3.4.5', '1.12'])
 def test_invalid_grammar_version(string):
     with pytest.raises(ValueError):
-        load_grammar(string)
+        load_grammar(version=string)
 
 
 def test_grammar_int_version():
     with pytest.raises(TypeError):
-        load_grammar(3.2)
+        load_grammar(version=3.2)
diff --git a/test/test_python_errors.py b/test/test_python_errors.py
index 7e3449a..660e10d 100644
--- a/test/test_python_errors.py
+++ b/test/test_python_errors.py
@@ -8,7 +8,7 @@ import parso
 from parso.python.normalizer import ErrorFinderConfig
 
 def _get_error_list(code, version=None):
-    grammar = parso.load_grammar(version)
+    grammar = parso.load_grammar(version=version)
     tree = grammar.parse(code)
     config = ErrorFinderConfig()
     return list(tree._get_normalizer_issues(config))