[refactor] fix imports of asjson() and related

Author: apalala

docs/models.rst

@@ -52,7 +52,7 @@ Viewing Models as JSON
 
 
 Models generated by |TatSu| can be viewed by converting them to a JSON-compatible structure
-with the help of ``tatsu.util.asjson.asjson()``. The protocol tries to provide the best
+with the help of ``tatsu.util.asjson()``. The protocol tries to provide the best
 representation for common types, and can handle any type using ``repr()``. There are provisions for structures with back-references, so there's no infinite recursion.
 
 .. code:: python

tatsu/ast.py

@@ -4,7 +4,7 @@
 import operator
 from functools import reduce
 
-from tatsu.util.asjson import asjson
+from tatsu.util import asjson
 
 from .util import is_list
 

tatsu/bootstrap.py

@@ -1127,7 +1127,7 @@ def main(filename, **kwargs):
 
 if __name__ == '__main__':
     import json
-    from tatsu.util.asjson import asjson
+    from tatsu.util import asjson
 
     ast = generic_main(main, EBNFBootstrapParser, name='EBNFBootstrap')
     data = asjson(ast)

tatsu/codegen/python.py

@@ -583,7 +583,7 @@ def main(filename, **kwargs):
 
                 if __name__ == '__main__':
                     import json
-                    from tatsu.util.asjson import asjson
+                    from tatsu.util import asjson
 
                     ast = generic_main(main, {name}Parser, name='{name}')
                     data = asjson(ast)

tatsu/ngcodegen/python.py

@@ -53,7 +53,7 @@ def main(filename, **kwargs):
 
 if __name__ == '__main__':
     import json
-    from tatsu.util.asjson import asjson
+    from tatsu.util import asjson
 
     ast = generic_main(main, {name}Parser, name='{name}')
     data = asjson(ast)

tatsu/objectmodel.py

@@ -5,7 +5,7 @@
 from dataclasses import dataclass
 from typing import Any
 
-from tatsu.util.asjson import AsJSONMixin, asjson, asjsons
+from tatsu.util import AsJSONMixin, asjson, asjsons
 
 from .ast import AST
 from .infos import CommentInfo, ParseInfo

tatsu/symtables.py

@@ -6,7 +6,7 @@
 from collections import defaultdict
 from copy import copy
 
-from tatsu.util.asjson import asjson
+from tatsu.util import asjson
 
 from .exceptions import ParseException
 from .infos import LineIndexInfo

tatsu/tool.py

@@ -11,13 +11,12 @@
 import sys
 from pathlib import Path
 
-from tatsu.parserconfig import ParserConfig
-
 from ._version import __version__
 from .exceptions import ParseException
 from .ngcodegen import codegen as ngpythoncg
 from .ngcodegen import objectmodel as ngobjectmodel
 from .parser import GrammarGenerator
+from .parserconfig import ParserConfig
 from .semantics import ModelBuilderSemantics
 from .util import eval_escapes
 

test/parsing_test.py

@@ -5,8 +5,7 @@
 
 import tatsu
 from tatsu.parser import EBNFBuffer
-from tatsu.util import eval_escapes, trim
-from tatsu.util.asjson import asjson
+from tatsu.util import asjson, eval_escapes, trim
 
 
 class MockIncludeBuffer(EBNFBuffer):

test/pickle_test.py

@@ -2,7 +2,7 @@
 
 from tatsu.semantics import ModelBuilderSemantics
 from tatsu.tool import compile
-from tatsu.util.asjson import asjson
+from tatsu.util import asjson
 
 
 def test_synth_model():