From f18bd6e150e6132d6fd72c2f02ac0db89c0c5aa0 Mon Sep 17 00:00:00 2001 From: Hernan Grecco Date: Sat, 20 Jan 2024 02:52:04 -0300 Subject: [PATCH] Changed formatter code to point from ureg.default_format to ureg.formatter.default_format --- pint/delegates/formatter/full.py | 8 ++++++++ pint/delegates/formatter/html.py | 6 ++++-- pint/delegates/formatter/latex.py | 12 ++++++++---- pint/delegates/formatter/plain.py | 24 ++++++++++++++++-------- 4 files changed, 36 insertions(+), 14 deletions(-) diff --git a/pint/delegates/formatter/full.py b/pint/delegates/formatter/full.py index c6782756d..c04f77771 100644 --- a/pint/delegates/formatter/full.py +++ b/pint/delegates/formatter/full.py @@ -66,6 +66,14 @@ def get_formatter(self, spec: str): for k, v in self._formatters.items(): if k in spec: return v + + from ...formatting import _ORPHAN_FORMATTER + + try: + return _ORPHAN_FORMATTER._formatters[spec] + except KeyError: + pass + return self._formatters["D"] def format_magnitude( diff --git a/pint/delegates/formatter/html.py b/pint/delegates/formatter/html.py index 5d8c48d40..7381a9c33 100644 --- a/pint/delegates/formatter/html.py +++ b/pint/delegates/formatter/html.py @@ -94,7 +94,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) if iterable(quantity.magnitude): @@ -136,7 +136,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) diff --git a/pint/delegates/formatter/latex.py b/pint/delegates/formatter/latex.py index d67ceda63..0ca3407f7 100644 --- a/pint/delegates/formatter/latex.py +++ b/pint/delegates/formatter/latex.py @@ -177,7 +177,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = r"{}\ {}" @@ -211,7 +211,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) @@ -279,7 +281,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = "{}{}" @@ -314,7 +316,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) diff --git a/pint/delegates/formatter/plain.py b/pint/delegates/formatter/plain.py index cfc7a9f58..7eb66a923 100644 --- a/pint/delegates/formatter/plain.py +++ b/pint/delegates/formatter/plain.py @@ -54,7 +54,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = "{} {}" @@ -81,7 +81,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) @@ -136,7 +138,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = "{} {}" @@ -163,7 +165,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) @@ -218,7 +222,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = "{} {}" @@ -246,7 +250,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = remove_custom_flags(meas_spec) @@ -308,7 +314,7 @@ def format_quantity( registry = quantity._REGISTRY mspec, uspec = split_format( - qspec, registry.default_format, registry.separate_format_defaults + qspec, registry.formatter.default_format, registry.separate_format_defaults ) joint_fstring = "{} {}" @@ -336,7 +342,9 @@ def format_measurement( registry = measurement._REGISTRY mspec, uspec = split_format( - meas_spec, registry.default_format, registry.separate_format_defaults + meas_spec, + registry.formatter.default_format, + registry.separate_format_defaults, ) unc_spec = meas_spec