Rename parser to defparser

pint/definitions.py

@@ -10,7 +10,7 @@
 
 from . import errors
 from ._vendor import flexparser as fp
-from .delegates import ParserConfig, txt_parser
+from .delegates import ParserConfig, txt_defparser
 
 
 class Definition:
@@ -19,7 +19,7 @@ class Definition:
     @classmethod
     def from_string(cls, s: str, non_int_type=float):
         cfg = ParserConfig(non_int_type)
-        parser = txt_parser.Parser(cfg, None)
+        parser = txt_defparser.DefParser(cfg, None)
         pp = parser.parse_string(s)
         for definition in parser.iter_parsed_project(pp):
             if isinstance(definition, Exception):

pint/delegates/__init__.py

@@ -8,7 +8,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-from . import txt_parser
-from .base_parser import ParserConfig, build_disk_cache_class
+from . import txt_defparser
+from .base_defparser import ParserConfig, build_disk_cache_class
 
-__all__ = [txt_parser, ParserConfig, build_disk_cache_class]
+__all__ = [txt_defparser, ParserConfig, build_disk_cache_class]

pint/delegates/base_parser.py → pint/delegates/base_defparser.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.base_parser
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.base_defparser
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Common class and function for all parsers.
 

pint/delegates/txt_parser/__init__.py → pint/delegates/txt_defparser/__init__.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser
-    ~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Parser for the original textual Pint Definition file.
 
@@ -9,6 +9,6 @@
 """
 
 
-from .parser import Parser
+from .defparser import DefParser
 
-__all__ = [Parser]
+__all__ = [DefParser]

pint/delegates/txt_parser/block.py → pint/delegates/txt_defparser/block.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.block
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.block
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Classes for Pint Blocks, which are defined by:
 

pint/delegates/txt_parser/common.py → pint/delegates/txt_defparser/common.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.common
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.common
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Definitions for parsing an Import Statement
 

pint/delegates/txt_parser/context.py → pint/delegates/txt_defparser/context.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.context
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.context
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Definitions for parsing Context and their related objects
 
@@ -24,7 +24,7 @@
 
 from ..._vendor import flexparser as fp
 from ...facets.context import definitions
-from ..base_parser import ParserConfig
+from ..base_defparser import ParserConfig
 from . import block, common, plain
 
 

pint/delegates/txt_parser/defaults.py → pint/delegates/txt_defparser/defaults.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.defaults
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.defaults
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Definitions for parsing Default sections.
 

pint/delegates/txt_parser/parser.py → pint/delegates/txt_defparser/defparser.py

@@ -5,7 +5,7 @@
 
 from ..._vendor import flexcache as fc
 from ..._vendor import flexparser as fp
-from .. import base_parser
+from .. import base_defparser
 from . import block, common, context, defaults, group, plain, system
 
 
@@ -47,7 +47,7 @@ class _PintParser(fp.Parser):
 
     _diskcache: fc.DiskCache
 
-    def __init__(self, config: base_parser.ParserConfig, *args, **kwargs):
+    def __init__(self, config: base_defparser.ParserConfig, *args, **kwargs):
         self._diskcache = kwargs.pop("diskcache", None)
         super().__init__(config, *args, **kwargs)
 
@@ -58,7 +58,7 @@ def parse_file(self, path: pathlib.Path) -> fp.ParsedSource:
         return content
 
 
-class Parser:
+class DefParser:
 
     skip_classes = (fp.BOF, fp.BOR, fp.BOS, fp.EOS, plain.CommentDefinition)
 

pint/delegates/txt_parser/group.py → pint/delegates/txt_defparser/group.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.group
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.group
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Definitions for parsing Group and their related objects
 

pint/delegates/txt_parser/plain.py → pint/delegates/txt_defparser/plain.py

@@ -1,6 +1,6 @@
 """
-    pint.delegates.txt_parser.plain
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.plain
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     Definitions for parsing:
     - Equality
@@ -29,7 +29,7 @@
 from ...converters import Converter
 from ...facets.plain import definitions
 from ...util import UnitsContainer
-from ..base_parser import ParserConfig
+from ..base_defparser import ParserConfig
 from . import common
 
 

pint/delegates/txt_parser/system.py → pint/delegates/txt_defparser/system.py

@@ -1,6 +1,6 @@
 """
-    pint.facets.systems.definitions
-    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    pint.delegates.txt_defparser.system
+    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
     :copyright: 2022 by Pint Authors, see AUTHORS for more details.
     :license: BSD, see LICENSE for more details.

pint/facets/context/definitions.py

@@ -105,10 +105,10 @@ def variables(self) -> Set[str, ...]:
     @classmethod
     def from_lines(cls, lines, non_int_type):
         # TODO: this is to keep it backwards compatible
-        from ...delegates import ParserConfig, txt_parser
+        from ...delegates import ParserConfig, txt_defparser
 
         cfg = ParserConfig(non_int_type)
-        parser = txt_parser.Parser(cfg, None)
+        parser = txt_defparser.DefParser(cfg, None)
         pp = parser.parse_string("\n".join(lines) + "\n@end")
         for definition in parser.iter_parsed_project(pp):
             if isinstance(definition, cls):

pint/facets/context/objects.py

@@ -184,12 +184,12 @@ def redefine(self, definition: str) -> None:
         definition : str
             <unit> = <new definition>``, e.g. ``pound = 0.5 kg``
         """
-        from ...delegates import ParserConfig, txt_parser
+        from ...delegates import ParserConfig, txt_defparser
 
         # TODO: kept for backwards compatibility.
         #       this is not a good idea as we have no way of known the correct non_int_type
         cfg = ParserConfig(float)
-        parser = txt_parser.Parser(cfg, None)
+        parser = txt_defparser.DefParser(cfg, None)
         pp = parser.parse_string(definition)
         for definition in parser.iter_parsed_project(pp):
             if isinstance(definition, UnitDefinition):

pint/facets/group/definitions.py

@@ -29,10 +29,10 @@ class GroupDefinition(errors.WithDefErr):
     @classmethod
     def from_lines(cls, lines, non_int_type):
         # TODO: this is to keep it backwards compatible
-        from ...delegates import ParserConfig, txt_parser
+        from ...delegates import ParserConfig, txt_defparser
 
         cfg = ParserConfig(non_int_type)
-        parser = txt_parser.Parser(cfg, None)
+        parser = txt_defparser.DefParser(cfg, None)
         pp = parser.parse_string("\n".join(lines) + "\n@end")
         for definition in parser.iter_parsed_project(pp):
             if isinstance(definition, cls):

pint/facets/plain/registry.py

@@ -189,7 +189,7 @@ class PlainRegistry(metaclass=RegistryMeta):
     _quantity_class = PlainQuantity
     _unit_class = PlainUnit
 
-    _parser = None
+    _def_parser = None
 
     def __init__(
         self,
@@ -221,7 +221,7 @@ def __init__(
                 cache_folder
             )
 
-        self._parser = delegates.txt_parser.Parser(
+        self._def_parser = delegates.txt_defparser.DefParser(
             delegates.ParserConfig(non_int_type), diskcache=self._diskcache
         )
 
@@ -406,9 +406,9 @@ def define(self, definition):
         """
 
         if isinstance(definition, str):
-            parsed_project = self._parser.parse_string(definition)
+            parsed_project = self._def_parser.parse_string(definition)
 
-            for definition in self._parser.iter_parsed_project(parsed_project):
+            for definition in self._def_parser.iter_parsed_project(parsed_project):
                 self._helper_dispatch_adder(definition)
         else:
             self._helper_dispatch_adder(definition)
@@ -514,11 +514,11 @@ def load_definitions(self, file, is_resource: bool = False):
 
         if isinstance(file, (list, tuple)):
             # TODO: this hack was to keep it backwards compatible.
-            parsed_project = self._parser.parse_string("\n".join(file))
+            parsed_project = self._def_parser.parse_string("\n".join(file))
         else:
-            parsed_project = self._parser.parse_file(file)
+            parsed_project = self._def_parser.parse_file(file)
 
-        for definition in self._parser.iter_parsed_project(parsed_project):
+        for definition in self._def_parser.iter_parsed_project(parsed_project):
             self._helper_dispatch_adder(definition)
 
         return parsed_project

pint/facets/system/definitions.py

@@ -45,10 +45,10 @@ class SystemDefinition(errors.WithDefErr):
     @classmethod
     def from_lines(cls, lines, non_int_type):
         # TODO: this is to keep it backwards compatible
-        from ...delegates import ParserConfig, txt_parser
+        from ...delegates import ParserConfig, txt_defparser
 
         cfg = ParserConfig(non_int_type)
-        parser = txt_parser.Parser(cfg, None)
+        parser = txt_defparser.DefParser(cfg, None)
         pp = parser.parse_string("\n".join(lines) + "\n@end")
         for definition in parser.iter_parsed_project(pp):
             if isinstance(definition, cls):