diff options
-rw-r--r-- | pint/facets/context/registry.py | 5 | ||||
-rw-r--r-- | pint/facets/dask/__init__.py | 3 | ||||
-rw-r--r-- | pint/facets/formatting/registry.py | 3 | ||||
-rw-r--r-- | pint/facets/group/registry.py | 4 | ||||
-rw-r--r-- | pint/facets/measurement/registry.py | 3 | ||||
-rw-r--r-- | pint/facets/nonmultiplicative/registry.py | 3 | ||||
-rw-r--r-- | pint/facets/numpy/registry.py | 3 | ||||
-rw-r--r-- | pint/registry.py | 4 |
8 files changed, 15 insertions, 13 deletions
diff --git a/pint/facets/context/registry.py b/pint/facets/context/registry.py index 8cff768..5483554 100644 --- a/pint/facets/context/registry.py +++ b/pint/facets/context/registry.py @@ -15,8 +15,8 @@ from typing import Any, Callable, ContextManager, Dict, Union from ..._typing import F from ...errors import DefinitionSyntaxError, UndefinedUnitError -from ...facets.plain import UnitDefinition from ...util import find_connected_nodes, find_shortest_path, logger +from ..plain import PlainRegistry, UnitDefinition from .definitions import ContextDefinition from .objects import Context, ContextChain @@ -36,8 +36,7 @@ class ContextCacheOverlay: self.parse_unit = registry_cache.parse_unit -# TODO: must subclass PlainRegistry when changed into facet. -class ContextRegistry: +class ContextRegistry(PlainRegistry): """Handle of Contexts. Conversion between units with different dimensions according diff --git a/pint/facets/dask/__init__.py b/pint/facets/dask/__init__.py index a7fad51..46fb38a 100644 --- a/pint/facets/dask/__init__.py +++ b/pint/facets/dask/__init__.py @@ -14,6 +14,7 @@ from __future__ import annotations import functools from ...compat import compute, dask_array, persist, visualize +from ..plain import PlainRegistry def check_dask_array(f): @@ -127,6 +128,6 @@ class DaskQuantity: visualize(self, **kwargs) -class DaskRegistry: +class DaskRegistry(PlainRegistry): _quantity_class = DaskQuantity diff --git a/pint/facets/formatting/registry.py b/pint/facets/formatting/registry.py index f3bd9c7..246cc43 100644 --- a/pint/facets/formatting/registry.py +++ b/pint/facets/formatting/registry.py @@ -8,10 +8,11 @@ from __future__ import annotations +from ..plain import PlainRegistry from .objects import FormattingQuantity, FormattingUnit -class FormattingRegistry: +class FormattingRegistry(PlainRegistry): _quantity_class = FormattingQuantity _unit_class = FormattingUnit diff --git a/pint/facets/group/registry.py b/pint/facets/group/registry.py index dd5d6fb..f8da191 100644 --- a/pint/facets/group/registry.py +++ b/pint/facets/group/registry.py @@ -14,12 +14,12 @@ if TYPE_CHECKING: from pint import Unit from ...util import build_dependent_class, create_class_with_registry -from ..plain import UnitDefinition +from ..plain import PlainRegistry, UnitDefinition from .definitions import GroupDefinition from .objects import Group -class GroupRegistry: +class GroupRegistry(PlainRegistry): """Handle of Groups. Group units diff --git a/pint/facets/measurement/registry.py b/pint/facets/measurement/registry.py index 77bde3d..9f051d7 100644 --- a/pint/facets/measurement/registry.py +++ b/pint/facets/measurement/registry.py @@ -11,10 +11,11 @@ from __future__ import annotations from ...compat import ufloat from ...util import build_dependent_class, create_class_with_registry +from ..plain import PlainRegistry from .objects import Measurement, MeasurementQuantity -class MeasurementRegistry: +class MeasurementRegistry(PlainRegistry): _quantity_class = MeasurementQuantity _measurement_class = Measurement diff --git a/pint/facets/nonmultiplicative/registry.py b/pint/facets/nonmultiplicative/registry.py index 75d4fcd..ae6b1b0 100644 --- a/pint/facets/nonmultiplicative/registry.py +++ b/pint/facets/nonmultiplicative/registry.py @@ -13,10 +13,11 @@ from typing import Any, Optional, Union from ...definitions import Definition from ...errors import DimensionalityError, UndefinedUnitError from ...util import UnitsContainer +from ..plain import PlainRegistry from .objects import NonMultiplicativeQuantity -class NonMultiplicativeRegistry: +class NonMultiplicativeRegistry(PlainRegistry): """Handle of non multiplicative units (e.g. Temperature). Capabilities: diff --git a/pint/facets/numpy/registry.py b/pint/facets/numpy/registry.py index 6eb0b44..8ae6088 100644 --- a/pint/facets/numpy/registry.py +++ b/pint/facets/numpy/registry.py @@ -9,11 +9,12 @@ from __future__ import annotations +from ..plain import PlainRegistry from .quantity import NumpyQuantity from .unit import NumpyUnit -class NumpyRegistry: +class NumpyRegistry(PlainRegistry): _quantity_class = NumpyQuantity _unit_class = NumpyUnit diff --git a/pint/registry.py b/pint/registry.py index 80f5ec4..a5aa9b3 100644 --- a/pint/registry.py +++ b/pint/registry.py @@ -22,7 +22,6 @@ from .facets import ( MeasurementRegistry, NonMultiplicativeRegistry, NumpyRegistry, - PlainRegistry, SystemRegistry, ) from .util import logger, pi_theorem @@ -34,9 +33,8 @@ class UnitRegistry( DaskRegistry, NumpyRegistry, MeasurementRegistry, - NonMultiplicativeRegistry, FormattingRegistry, - PlainRegistry, + NonMultiplicativeRegistry, ): """The unit registry stores the definitions and relationships between units. |