Fix python2 issues with StoppableThread (#660)

holoviz · Sep 25, 2019 · 27f8f1a · 27f8f1a
1 parent fbbf8da
commit 27f8f1a
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/panel/io/server.py b/panel/io/server.py
@@ -122,15 +122,24 @@ def _check_stopped(self):
         if self.stopped:
             self._cb.stop()
             self.io_loop.stop()
-    
+
     def run(self):
+        if hasattr(self, '_target'):
+            target, args, kwargs = self._target, self._args, self.__kwargs
+        else:
+            target, args, kwargs = self._Thread__target, self._Thread__args, self._Thread__kwargs
+        if not target:
+            return
+        bokeh_server = None
         try:
-            if self._target:
-                bokeh_server = self._target(*self._args, **self._kwargs)
+            bokeh_server = target(*args, **kwargs)
         finally:
             if isinstance(bokeh_server, Server):
                 bokeh_server.stop()
-            del self._target, self._args, self._kwargs
+            if hasattr(self, '_target'):
+                del self._target, self._args, self._kwargs
+            else:
+                del self._Thread__target, self._Thread__args, self._Thread__kwargs
 
     def stop(self):
         self._stop_event.set()