WIP status of dim_order branch

Signed-off-by: Michael Tiemann <[email protected]>
MichaelTiemannOSC · Oct 28, 2023 · e3d9bdc · e3d9bdc
1 parent 69f9474
commit e3d9bdc
Show file tree

Hide file tree

Showing 17 changed files with 987 additions and 1,018 deletions.
diff --git a/pint/__init__.py b/pint/__init__.py
@@ -25,7 +25,6 @@
     UndefinedUnitError,
     UnitStrippedWarning,
 )
-from .formatting import formatter, register_unit_format
 from .registry import ApplicationRegistry, LazyRegistry, UnitRegistry
 from .util import logger, pi_theorem  # noqa: F401
 
@@ -134,7 +133,6 @@ def get_application_registry():
     "RedefinitionError",
     "UndefinedUnitError",
     "UnitStrippedWarning",
-    "formatter",
     "get_application_registry",
     "set_application_registry",
     "register_unit_format",

diff --git a/pint/_vendor/flexparser.py b/pint/_vendor/flexparser.py
@@ -273,7 +273,7 @@ def _build_delimiter_pattern(delimiters: ty.Tuple[str, ...]) -> re.Pattern:
 DelimiterDictT = ty.Dict[str, ty.Tuple[DelimiterInclude, DelimiterAction]]
 
 
-class Spliter:
+class Splitter:
     """Content iterator splitting according to given delimiters.
 
     The pattern can be changed dynamically sending a new pattern to the generator,
@@ -458,24 +458,24 @@ def __init__(
         self, content: str, delimiters: DelimiterDictT, strip_spaces: bool = True
     ):
         self._cache = collections.deque()
-        self._spliter = Spliter(content, delimiters)
+        self._splitter = Splitter(content, delimiters)
         self._strip_spaces = strip_spaces
 
     def __iter__(self):
         return self
 
     def set_delimiters(self, delimiters: DelimiterDictT):
-        self._spliter.set_delimiters(delimiters)
+        self._splitter.set_delimiters(delimiters)
         if self._cache:
             value = self.peek()
             # Elements are 1 based indexing, while splitter is 0 based.
-            self._spliter.set_position(value.start_line - 1, value.start_col)
+            self._splitter.set_position(value.start_line - 1, value.start_col)
             self._cache.clear()
 
     def _get_next_strip(self) -> Statement:
         part = ""
         while not part:
-            start_line, start_col, end_line, end_col, part = next(self._spliter)
+            start_line, start_col, end_line, end_col, part = next(self._splitter)
             lo = len(part)
             part = part.lstrip()
             start_col += lo - len(part)
@@ -494,7 +494,7 @@ def _get_next(self) -> Statement:
 
         part = ""
         while not part:
-            start_line, start_col, end_line, end_col, part = next(self._spliter)
+            start_line, start_col, end_line, end_col, part = next(self._splitter)
 
         return Statement.from_statement_iterator_element(
             (start_line + 1, start_col, end_line + 1, end_col, part)

diff --git a/pint/default_en.txt b/pint/default_en.txt
@@ -56,8 +56,6 @@
 @defaults
     group = international
     system = mks
-    # This default order for sorting dimensions was described in the proposed ISO 80000 specification.
-    dim_order = [ "[substance]", "[mass]", "[current]", "[luminosity]", "[length]", "[]", "[time]", "[temperature]", ]
 @end
 
 

diff --git a/pint/delegates/__init__.py b/pint/delegates/__init__.py
@@ -10,5 +10,6 @@
 
 from . import txt_defparser
 from .base_defparser import ParserConfig, build_disk_cache_class
+from .base_formatter import Formatter
 
-__all__ = ["txt_defparser", "ParserConfig", "build_disk_cache_class"]
+__all__ = ["txt_defparser", "ParserConfig", "build_disk_cache_class", "Formatter"]