Remove temporary aliases for PlainQuantity and PlainUnit

4 files changed, 12 insertions, 12 deletions

diff --git a/pint/facets/measurement/__init__.py b/pint/facets/measurement/__init__.py
index 31ba1a1..cfba6cc 100644
--- a/pint/facets/measurement/__init__.py
+++ b/pint/facets/measurement/__init__.py
@@ -4,7 +4,7 @@ import re
 from ...compat import ufloat
 from ...formatting import _FORMATS, extract_custom_flags, siunitx_format_unit
 from ...util import build_dependent_class, create_class_with_registry
-from ..plain import Quantity
+from ..plain import PlainQuantity
 
 MISSING = object()
 
@@ -24,7 +24,7 @@ class MeasurementQuantity:
         return self._REGISTRY.Measurement(copy.copy(self.magnitude), error, self._units)
 
 
-class Measurement(Quantity):
+class Measurement(PlainQuantity):
     """Implements a class to describe a quantity with uncertainty.
 
     Parameters
diff --git a/pint/facets/plain/__init__.py b/pint/facets/plain/__init__.py
index 562669b..51c6899 100644
--- a/pint/facets/plain/__init__.py
+++ b/pint/facets/plain/__init__.py
@@ -16,12 +16,12 @@ from .definitions import (
     ScaleConverter,
     UnitDefinition,
 )
-from .objects import Quantity, Unit, UnitsContainer
+from .objects import PlainQuantity, PlainUnit, UnitsContainer
 from .registry import PlainRegistry
 
 __all__ = [
-    Unit,
-    Quantity,
+    PlainUnit,
+    PlainQuantity,
     PlainRegistry,
     AliasDefinition,
     DefaultsDefinition,
diff --git a/pint/facets/plain/objects.py b/pint/facets/plain/objects.py
index 250675c..1d3dfc0 100644
--- a/pint/facets/plain/objects.py
+++ b/pint/facets/plain/objects.py
@@ -6,7 +6,7 @@
     :license: BSD, see LICENSE for more details.
 """
 
-from .quantity import PlainQuantity, Quantity
-from .unit import PlainUnit, Unit, UnitsContainer
+from .quantity import PlainQuantity
+from .unit import PlainUnit, UnitsContainer
 
-__all__ = [Quantity, Unit, PlainUnit, PlainQuantity, UnitsContainer]
+__all__ = [PlainUnit, PlainQuantity, UnitsContainer]
diff --git a/pint/facets/plain/registry.py b/pint/facets/plain/registry.py
index 07bd9ed..0f7c569 100644
--- a/pint/facets/plain/registry.py
+++ b/pint/facets/plain/registry.py
@@ -31,8 +31,8 @@ from typing import (
 
 if TYPE_CHECKING:
     from ..context import Context
+    from pint import Quantity, Unit
 
-# from pint import parser, Quantity, Unit
 from ... import parser
 from ..._typing import QuantityOrUnitLike, UnitLike
 from ..._vendor import appdirs
@@ -65,7 +65,7 @@ from .definitions import (
     ScaleConverter,
     UnitDefinition,
 )
-from .objects import PlainQuantity, PlainUnit, Quantity, Unit
+from .objects import PlainQuantity, PlainUnit
 
 if TYPE_CHECKING:
 
@@ -799,7 +799,7 @@ class PlainRegistry(metaclass=RegistryMeta):
 
     def get_root_units(
         self, input_units: UnitLike, check_nonmult: bool = True
-    ) -> Tuple[Number, "Unit"]:
+    ) -> Tuple[Number, PlainUnit]:
         """Convert unit or dict of units to the root units.
 
         If any unit is non multiplicative and check_converter is True,
@@ -912,7 +912,7 @@ class PlainRegistry(metaclass=RegistryMeta):
 
     def get_compatible_units(
         self, input_units, group_or_system=None
-    ) -> FrozenSet["Unit"]:
+    ) -> FrozenSet[Unit]:
         """ """
         input_units = to_units_container(input_units)