clean up

Author: hoxbro

holoviews/tests/core/test_dynamic.py

@@ -917,32 +917,23 @@ def test_dynamic_rx(self):
         assert_element_equal(dmap[()], hv.Curve(sine_array(0, 2)))
 
 
-class TestStreamSubscribersAddandClear:
-    def setup_method(self):
-        self.fn1 = lambda x: x
-        self.fn2 = lambda x: x**2
-        self.fn3 = lambda x: x**3
-        self.fn4 = lambda x: x**4
-
-    # Precedence one and below is the user range, above one is reserved for
-    # HoloViews, as documented on Stream.add_subscriber
-    @pytest.mark.parametrize(
-        ("policy", "remaining"),
-        [
-            ("all", []),
-            ("user", ["fn3", "fn4"]),
-            ("internal", ["fn1", "fn2"]),
-        ],
-    )
-    def test_subscriber_clear(self, policy, remaining):
-        pointerx = PointerX(x=2)
-        pointerx.add_subscriber(self.fn1, precedence=0)
-        pointerx.add_subscriber(self.fn2, precedence=1)
-        pointerx.add_subscriber(self.fn3, precedence=1.5)
-        pointerx.add_subscriber(self.fn4, precedence=10)
-        assert pointerx.subscribers == [self.fn1, self.fn2, self.fn3, self.fn4]
-        pointerx.clear(policy)
-        assert pointerx.subscribers == [getattr(self, name) for name in remaining]
+@pytest.mark.parametrize(
+    ("policy", "remaining"),
+    [("all", []), ("user", ["fn3", "fn4"]), ("internal", ["fn1", "fn2"])],
+)
+def test_subscriber_clear(self, policy, remaining):
+    self.fn1 = lambda x: x
+    self.fn2 = lambda x: x**2
+    self.fn3 = lambda x: x**3
+    self.fn4 = lambda x: x**4
+    pointerx = PointerX(x=2)
+    pointerx.add_subscriber(self.fn1, precedence=0)
+    pointerx.add_subscriber(self.fn2, precedence=1)
+    pointerx.add_subscriber(self.fn3, precedence=1.5)
+    pointerx.add_subscriber(self.fn4, precedence=10)
+    assert pointerx.subscribers == [self.fn1, self.fn2, self.fn3, self.fn4]
+    pointerx.clear(policy)
+    assert pointerx.subscribers == [getattr(self, name) for name in remaining]
 
 
 class TestDynamicStreamReset:

holoviews/tests/plotting/bokeh/test_plot.py

@@ -115,9 +115,6 @@ def test_overlay_plot_stream_cleanup():
 
     plot = bokeh_renderer.get_plot(dmap1 * dmap2)
 
-    # The overlay plot subscribes once per stream. It used to subscribe four
-    # times, as attach_streams compared the refresh method against the
-    # (precedence, subscriber) pairs and so never recognised it
     assert stream1.subscribers == [plot.refresh]
     assert stream2.subscribers == [plot.refresh]
 

holoviews/tests/plotting/plotly/test_plot.py

@@ -37,9 +37,6 @@ def test_overlay_plot_stream_cleanup():
 
     plot = plotly_renderer.get_plot(dmap1 * dmap2)
 
-    # The overlay plot subscribes once per stream. It used to subscribe four
-    # times, as attach_streams compared the refresh method against the
-    # (precedence, subscriber) pairs and so never recognised it
     assert stream1.subscribers == [plot.refresh]
     assert stream2.subscribers == [plot.refresh]
 

holoviews/tests/test_streams.py

@@ -828,24 +828,14 @@ def on_update(self, **kwargs):
         self.calls.append(kwargs)
 
 
-def _closure(app):
-    def on_update(**kwargs):
-        app.calls.append(kwargs)
-
-    return on_update
-
-
-# The four ways a subscriber can reach back into its owner. Only the first two
-# were ever wrapped weakly, so the closure forms have always leaked.
 subscriber_kinds = pytest.mark.parametrize(
     "make_subscriber",
     [
         lambda app: app.on_update,
         lambda app: partial(app.on_update, extra=1),
-        _closure,
         lambda app: lambda **kwargs: app.calls.append(kwargs),
     ],
-    ids=["bound_method", "partial", "closure", "lambda"],
+    ids=["bound_method", "partial", "lambda"],
 )
 
 
@@ -916,8 +906,6 @@ def test_distinct_partials_not_deduplicated(self):
 
 class TestStreamSource:
     def teardown_method(self):
-        # Only drop the leftover entries, replacing the registry itself would
-        # swap in a strongly keyed mapping and mask any leak
         with param.logging_level("ERROR"):
             Stream.registry.clear()
 
@@ -951,10 +939,6 @@ def test_source_registry_empty_element(self):
         assert points in Stream.registry
 
     def test_source_registry_releases_source(self):
-        # The registry indexes its streams weakly, so an entry can never keep
-        # its own source alive, not even through a subscriber reaching back to
-        # it (#6875). Collecting the source drops the entry with it, as the
-        # registry is still keyed weakly.
         def build():
             points = hv.Points([(0, 0)])
             stream = PointerX(source=points)