Merge branch 'origin/abn/openfile_fix'

diff --git a/src/PV_SWIG/VTKWrapping/paravisSM.py b/src/PV_SWIG/VTKWrapping/paravisSM.py
index 8237dfc16b2b22774c5b412a55770e90ef89803f..a878681d4a59b646b7c5a1afe7a461bcaa0017df 100644 (file)
--- a/src/PV_SWIG/VTKWrapping/paravisSM.py
+++ b/src/PV_SWIG/VTKWrapping/paravisSM.py
@@ -1893,8 +1893,8 @@ def InitFromGUI():
     Method used to initialize the Python Shell from the ParaView GUI.
     """
     global fromGUI, ActiveConnection
-    if not fromGUI:
-       print "from paraview.simple import *"
+#     if not fromGUI:
+#        print "from paraview.simple import *"
     fromGUI = True
     # ToggleProgressPrinting() ### FIXME COLLABORATION
     enableMultiServer(vtkProcessModule.GetProcessModule().GetMultipleSessionsSupport())

diff --git a/src/PV_SWIG/VTKWrapping/pvsimple.py b/src/PV_SWIG/VTKWrapping/pvsimple.py
index 6a77e5f288ddb23f60717344dc842566cdcadcda..350b573a168c9c7df86445b9fabd5d3390329326 100644 (file)
--- a/src/PV_SWIG/VTKWrapping/pvsimple.py
+++ b/src/PV_SWIG/VTKWrapping/pvsimple.py
@@ -186,7 +186,9 @@ def OpenDataFile(filename, **extraArgs):
         raise RuntimeError, msg
     prototype = servermanager.ProxyManager().GetPrototypeProxy(
       reader_factor.GetReaderGroup(), reader_factor.GetReaderName())
-    xml_name = paraview.make_name_valid(prototype.GetXMLLabel())
+    # [ABN]: bug fix for Christian VW (temporary - pvsimple should disappear soon) 
+    from paraview import make_name_valid  # make_name_valid is not in paravisSM
+    xml_name = make_name_valid(prototype.GetXMLLabel())
     reader_func = _create_func(xml_name, servermanager.sources)
     if prototype.GetProperty("FileNames"):
       reader = reader_func(FileNames=filename, **extraArgs)