chore: Clean up and deprecate old API (#6863)

Author: hoxbro

holoviews/core/dimension.py

@@ -33,7 +33,15 @@
 
 title_format = "{name}: {val}{unit}"
 
-redim = Redim  # pickle compatibility - remove in 2.0
+
+class redim(Redim):
+    def __init__(self, *args, **kwargs):
+        from ..util.warnings import deprecated
+
+        # exists because of pickle compatibility
+        deprecated("1.24.0", "redim", "Redim")
+        super().__init__(*args, **kwargs)
+
 
 if t.TYPE_CHECKING:
     from typing_extensions import Self

holoviews/core/ndmapping.py

@@ -7,6 +7,7 @@
 from __future__ import annotations
 
 import typing as t
+from contextlib import contextmanager
 from itertools import cycle
 from operator import itemgetter
 
@@ -36,43 +37,35 @@ def _has_split_overlays(obj) -> TypeIs[HoloMap]:
     return hasattr(obj, "_split_overlays")
 
 
-class item_check:
+@contextmanager
+def item_check(enabled):
     """Context manager to allow creating NdMapping types without
     performing the usual item_checks, providing significant
     speedups when there are a lot of items. Should only be
     used when both keys and values are guaranteed to be the
     right type, as is the case for many internal operations.
-
     """
-
-    def __init__(self, enabled):
-        self.enabled = enabled
-
-    def __enter__(self):
-        self._enabled = MultiDimensionalMapping._check_items
-        MultiDimensionalMapping._check_items = self.enabled
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        MultiDimensionalMapping._check_items = self._enabled
+    prev = MultiDimensionalMapping._check_items
+    try:
+        MultiDimensionalMapping._check_items = enabled
+        yield
+    finally:
+        MultiDimensionalMapping._check_items = prev
 
 
-class sorted_context:
+@contextmanager
+def sorted_context(enabled):
     """Context manager to temporarily disable sorting on NdMapping
     types. Retains the current sort order, which can be useful as
     an optimization on NdMapping instances where sort=True but the
     items are already known to have been sorted.
-
     """
-
-    def __init__(self, enabled):
-        self.enabled = enabled
-
-    def __enter__(self):
-        self._enabled = MultiDimensionalMapping.sort
-        MultiDimensionalMapping.sort = self.enabled
-
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        MultiDimensionalMapping.sort = self._enabled  # ty:ignore[invalid-assignment]
+    prev = MultiDimensionalMapping.sort
+    try:
+        MultiDimensionalMapping.sort = enabled
+        yield
+    finally:
+        MultiDimensionalMapping.sort = prev  # ty:ignore[invalid-assignment]
 
 
 class MultiDimensionalMapping(Dimensioned):

holoviews/core/options.py

@@ -46,7 +46,6 @@
 import param
 
 from ..util.warnings import HoloviewsUserWarning, warn
-from .accessors import Opts  # noqa: F401 (clean up in 2.0)
 from .pprint import InfoPrinter
 from .tree import AttrTree
 from .util import group_sanitizer, label_sanitizer, sanitize_identifier
@@ -56,6 +55,17 @@
     from ..util.settings import OutputSettings
 
 
+def __getattr__(name):
+    if name == "Opts":
+        from ..util.warnings import deprecated
+        from .accessors import Opts
+
+        deprecated("1.24.0", "holoviews.core.options.Opts", "holoviews.core.accessors.Opts")
+        return Opts
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+
 def cleanup_custom_options(id, weakref=None):
     """Cleans up unused custom trees if all objects referencing the
     custom id have been garbage collected or tree is otherwise

holoviews/core/util/__init__.py

@@ -60,12 +60,6 @@
     from ..layout import AdjointLayout
     from ..ndmapping import UniformNdMapping
 
-# Python 2 builtins
-basestring = str
-long = int
-unicode = str
-cmp = lambda a, b: (a > b) - (a < b)
-
 get_keywords = operator.attrgetter("varkw")
 
 anonymous_dimension_label = "_"