From 430c4aa71e304ba1cc5f5ed1fdfaceed936f7c72 Mon Sep 17 00:00:00 2001
From: Hernan <hernan.grecco@gmail.com>
Date: Sun, 1 May 2022 13:34:44 -0300
Subject: Facets root should only expose classes (not modules)

---
 pint/__init__.py        |  2 +-
 pint/facets/__init__.py | 24 +++++++++++++++++---
 pint/registry.py        | 60 +++++++++++++++++++++++++------------------------
 3 files changed, 53 insertions(+), 33 deletions(-)

diff --git a/pint/__init__.py b/pint/__init__.py
index a450323..b30409a 100644
--- a/pint/__init__.py
+++ b/pint/__init__.py
@@ -25,7 +25,6 @@ from .errors import (  # noqa: F401
     UndefinedUnitError,
     UnitStrippedWarning,
 )
-from .facets.context import Context
 from .formatting import formatter, register_unit_format
 from .registry import ApplicationRegistry, LazyRegistry, UnitRegistry
 from .util import logger, pi_theorem  # noqa: F401
@@ -35,6 +34,7 @@ from .util import logger, pi_theorem  # noqa: F401
 Quantity = UnitRegistry.Quantity
 Unit = UnitRegistry.Unit
 Measurement = UnitRegistry.Measurement
+Context = UnitRegistry.Context
 
 try:  # pragma: no cover
     __version__ = version("pint")
diff --git a/pint/facets/__init__.py b/pint/facets/__init__.py
index 6d18043..a3f2439 100644
--- a/pint/facets/__init__.py
+++ b/pint/facets/__init__.py
@@ -72,6 +72,24 @@
 
 from __future__ import annotations
 
-from . import context, dask, group, measurement, nonmultiplicative, numpy, plain, system
-
-__all__ = [plain, nonmultiplicative, numpy, dask, measurement, context, group, system]
+from .context import ContextRegistry
+from .dask import DaskRegistry
+from .formatting import FormattingRegistry
+from .group import GroupRegistry
+from .measurement import MeasurementRegistry
+from .nonmultiplicative import NonMultiplicativeRegistry
+from .numpy import NumpyRegistry
+from .plain import PlainRegistry
+from .system import SystemRegistry
+
+__all__ = [
+    ContextRegistry,
+    DaskRegistry,
+    FormattingRegistry,
+    GroupRegistry,
+    MeasurementRegistry,
+    NonMultiplicativeRegistry,
+    NumpyRegistry,
+    PlainRegistry,
+    SystemRegistry,
+]
diff --git a/pint/registry.py b/pint/registry.py
index 7b282c5..98a716c 100644
--- a/pint/registry.py
+++ b/pint/registry.py
@@ -1,49 +1,51 @@
 """
-pint.registry
-~~~~~~~~~~~~~
+    pint.registry
+    ~~~~~~~~~~~~~
 
-Defines the Registry, a class to contain units and their relations.
+    Defines the Registry, a class to contain units and their relations.
 
-The module actually defines 5 registries with different capabilities:
+    The facet_module actually defines 5 registries with different capabilities:
 
-- PlainRegistry: Basic unit definition and querying.
-                Conversion between multiplicative units.
+    - PlainRegistry: Basic unit definition and querying.
+                    Conversion between multiplicative units.
 
-- NonMultiplicativeRegistry: Conversion between non multiplicative (offset) units.
-                             (e.g. Temperature)
+    - NonMultiplicativeRegistry: Conversion between non multiplicative (offset) units.
+                                 (e.g. Temperature)
 
-  * Inherits from PlainRegistry
+      * Inherits from PlainRegistry
 
-- ContextRegisty: Conversion between units with different dimensions according
-                  to previously established relations (contexts) - e.g. in spectroscopy,
-                  conversion between frequency and energy is possible. May also override
-                  conversions between units on the same dimension - e.g. different
-                  rounding conventions.
+    - ContextRegisty: Conversion between units with different dimensions according
+                      to previously established relations (contexts) - e.g. in spectroscopy,
+                      conversion between frequency and energy is possible. May also override
+                      conversions between units on the same dimension - e.g. different
+                      rounding conventions.
 
-  * Inherits from PlainRegistry
+      * Inherits from PlainRegistry
 
-- SystemRegistry: Group unit and changing of plain units.
-                  (e.g. in MKS, meter, kilogram and second are plain units.)
+    - SystemRegistry: Group unit and changing of plain units.
+                      (e.g. in MKS, meter, kilogram and second are plain units.)
 
-  * Inherits from PlainRegistry
+      * Inherits from PlainRegistry
 
-- UnitRegistry: Combine all previous capabilities, it is exposed by Pint.
+    - UnitRegistry: Combine all previous capabilities, it is exposed by Pint.
 
-:copyright: 2016 by Pint Authors, see AUTHORS for more details.
-:license: BSD, see LICENSE for more details.
+    :copyright: 2016 by Pint Authors, see AUTHORS for more details.
+    :license: BSD, see LICENSE for more details.
 """
 
 from __future__ import annotations
 
 from . import registry_helpers
-from .facets.context import ContextRegistry
-from .facets.dask import DaskRegistry
-from .facets.formatting import FormattingRegistry
-from .facets.measurement import MeasurementRegistry
-from .facets.nonmultiplicative import NonMultiplicativeRegistry
-from .facets.numpy import NumpyRegistry
-from .facets.plain import PlainRegistry
-from .facets.system import SystemRegistry
+from .facets import (
+    ContextRegistry,
+    DaskRegistry,
+    FormattingRegistry,
+    MeasurementRegistry,
+    NonMultiplicativeRegistry,
+    NumpyRegistry,
+    PlainRegistry,
+    SystemRegistry,
+)
 from .util import logger, pi_theorem
 
 
-- 
cgit v1.2.1