Commit da651270 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'vtkweb-import-fixes'

ec6dcc0f vtkweb: import vtkWebCore properly
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: Sebastien Jourdain's avatarSebastien Jourdain <sebastien.jourdain@kitware.com>
Merge-request: !1663
parents 9fa5d222 ec6dcc0f
Pipeline #18956 running with stage
......@@ -6,7 +6,7 @@ very specific web application.
from time import time
import os, sys, logging, types, inspect, traceback, logging, re
from vtkWebCorePython import vtkWebApplication, vtkWebInteractionEvent
from vtk.vtkWebCorePython import vtkWebApplication, vtkWebInteractionEvent
from autobahn.wamp import register as exportRpc
# =============================================================================
......
......@@ -27,9 +27,9 @@ from autobahn.twisted.websocket import WebSocketServerProtocol
from vtk.web import protocols
try:
from vtkWebCore import vtkWebApplication
from vtk.vtkWebCore import vtkWebApplication
except:
from vtkWebCorePython import vtkWebApplication
from vtk.vtkWebCorePython import vtkWebApplication
# =============================================================================
salt = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(32))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment