Ensure that empty Stream source elements get remapped (#3978)

holoviz · Sep 20, 2019 · 3f411fa · 3f411fa
1 parent f5ac179
commit 3f411fa
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/holoviews/streams.py b/holoviews/streams.py
@@ -338,10 +338,12 @@ def source(self):
 
     @source.setter
     def source(self, source):
-        if self.source:
+        if self.source is not None:
             source_list = self.registry[self.source]
             if self in source_list:
                 source_list.remove(self)
+            if not source_list:
+                self.registry.pop(self.source)
 
         if source is None:
             self._source = None

diff --git a/holoviews/tests/teststreams.py b/holoviews/tests/teststreams.py
@@ -626,6 +626,15 @@ def test_source_empty_element(self):
         stream = PointerX(source=points)
         self.assertIs(stream.source, points)
 
+    def test_source_empty_element_remap(self):
+        points = Points([])
+        stream = PointerX(source=points)
+        self.assertIs(stream.source, points)
+        curve = Curve([])
+        stream.source = curve
+        self.assertNotIn(points, Stream.registry)
+        self.assertIn(curve, Stream.registry)
+
     def test_source_empty_dmap(self):
         points_dmap = DynamicMap(lambda x: Points([]), kdims=['X'])
         stream = PointerX(source=points_dmap)