More cleanup of import

6 files changed, 10 insertions, 8 deletions

diff --git a/pint/facets/context/definitions.py b/pint/facets/context/definitions.py
index 6e07ba5..96f1e90 100644
--- a/pint/facets/context/definitions.py
+++ b/pint/facets/context/definitions.py
@@ -16,10 +16,10 @@ from typing import TYPE_CHECKING, Any, Callable, Dict, Tuple
 from ...definitions import Definition
 from ...errors import DefinitionSyntaxError
 from ...util import ParserHelper, SourceIterator
-from ..plain.definitions import UnitDefinition
+from ..plain import UnitDefinition
 
 if TYPE_CHECKING:
-    from ..plain.quantity import Quantity
+    from pint import Quantity
 
 _header_re = re.compile(
     r"@context\s*(?P<defaults>\(.*\))?\s+(?P<name>\w+)\s*(=(?P<aliases>.*))*"
diff --git a/pint/facets/context/registry.py b/pint/facets/context/registry.py
index 27f19bb..8cff768 100644
--- a/pint/facets/context/registry.py
+++ b/pint/facets/context/registry.py
@@ -51,6 +51,8 @@ class ContextRegistry:
     - Parse @context directive.
     """
 
+    Context = Context
+
     def __init__(self, **kwargs: Any) -> None:
         # Map context name (string) or abbreviation to context.
         self._contexts: Dict[str, Context] = {}
diff --git a/pint/facets/group/definitions.py b/pint/facets/group/definitions.py
index 5bb14f8..d2fa3f2 100644
--- a/pint/facets/group/definitions.py
+++ b/pint/facets/group/definitions.py
@@ -15,7 +15,7 @@ from typing import Tuple
 from ...definitions import Definition
 from ...errors import DefinitionSyntaxError
 from ...util import SourceIterator
-from ..plain.definitions import UnitDefinition
+from ..plain import UnitDefinition
 
 
 @dataclass(frozen=True)
diff --git a/pint/facets/group/registry.py b/pint/facets/group/registry.py
index 1ec0799..dd5d6fb 100644
--- a/pint/facets/group/registry.py
+++ b/pint/facets/group/registry.py
@@ -14,7 +14,7 @@ if TYPE_CHECKING:
     from pint import Unit
 
 from ...util import build_dependent_class, create_class_with_registry
-from ..plain.definitions import UnitDefinition
+from ..plain import UnitDefinition
 from .definitions import GroupDefinition
 from .objects import Group
 
diff --git a/pint/facets/nonmultiplicative/definitions.py b/pint/facets/nonmultiplicative/definitions.py
index 024fedb..dbfc0ff 100644
--- a/pint/facets/nonmultiplicative/definitions.py
+++ b/pint/facets/nonmultiplicative/definitions.py
@@ -11,7 +11,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 
 from ...compat import HAS_NUMPY, exp, log
-from ..plain.definitions import ScaleConverter
+from ..plain import ScaleConverter
 
 
 @dataclass(frozen=True)
diff --git a/pint/facets/numpy/numpy_func.py b/pint/facets/numpy/numpy_func.py
index 4662761..7143143 100644
--- a/pint/facets/numpy/numpy_func.py
+++ b/pint/facets/numpy/numpy_func.py
@@ -12,9 +12,9 @@ import warnings
 from inspect import signature
 from itertools import chain
 
-from pint.compat import is_upcast_type, np, zero_or_nan
-from pint.errors import DimensionalityError, UnitStrippedWarning
-from pint.util import iterable, sized
+from ...compat import is_upcast_type, np, zero_or_nan
+from ...errors import DimensionalityError, UnitStrippedWarning
+from ...util import iterable, sized
 
 HANDLED_UFUNCS = {}
 HANDLED_FUNCTIONS = {}