Use formatter delegate in plain facet (will not be used while the For…

…matting facet is in place)
hgrecco · Nov 3, 2023 · d0cf14f · d0cf14f
1 parent 05d4778
commit d0cf14f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/pint/facets/plain/quantity.py b/pint/facets/plain/quantity.py
@@ -263,7 +263,7 @@ def __deepcopy__(self, memo) -> PlainQuantity[MagnitudeT]:
         return ret
 
     def __str__(self) -> str:
-        return str(self.magnitude) + " " + str(self.units)
+        return self._REGISTRY.formatter.format_quantity(self)
 
     def __bytes__(self) -> bytes:
         return str(self).encode(locale.getpreferredencoding())

diff --git a/pint/facets/plain/registry.py b/pint/facets/plain/registry.py
@@ -52,6 +52,7 @@
 if TYPE_CHECKING:
     from ..context import Context
     from ...compat import Locale
+    from ... import protocols
 
     # from ..._typing import Quantity, Unit
 
@@ -215,6 +216,8 @@ class GenericPlainRegistry(Generic[QuantityT, UnitT], metaclass=RegistryMeta):
     _diskcache = None
     _def_parser = None
 
+    formatter: protocols.Formatter
+
     def __init__(
         self,
         filename="",
@@ -251,6 +254,8 @@ def __init__(
             delegates.ParserConfig(non_int_type), diskcache=self._diskcache
         )
 
+        self.formatter = delegates.Formatter()
+
         self._filename = filename
         self.force_ndarray = force_ndarray
         self.force_ndarray_like = force_ndarray_like

diff --git a/pint/facets/plain/unit.py b/pint/facets/plain/unit.py
@@ -59,7 +59,7 @@ def __deepcopy__(self, memo) -> PlainUnit:
         return ret
 
     def __str__(self) -> str:
-        return " ".join(k if v == 1 else f"{k} ** {v}" for k, v in self._units.items())
+        return self._REGISTRY.formatter.format_unit(self)
 
     def __bytes__(self) -> bytes:
         return str(self).encode(locale.getpreferredencoding())