+44,56c45,46
+< def switchActiveConnection(newActiveConnection=None, ns=None):
+< if not ns:
+< ns = globals()
+< _remove_functions(ns)
+< servermanager.switchActiveConnection(newActiveConnection)
+< _add_functions(ns)
+<
+< def Disconnect(ns=None, force=True):
+< if servermanager.ActiveConnection and (force or servermanager.MultiServerConnections == None):
+< if ns:
+< _remove_functions(ns)
+< _remove_functions(globals())
+< servermanager.ProxyManager().DisableStateUpdateNotification()
+---
+> def _disconnect():
+> if servermanager.ActiveConnection:
+61d50
+< servermanager.Disconnect()
+62a52
+> servermanager.Disconnect()
+69,70c59,60
+< Disconnect(globals(), False)
+< connection = servermanager.Connect(ds_host, ds_port, rs_host, rs_port)
+---
+> _disconnect()
+> session = servermanager.Connect(ds_host, ds_port, rs_host, rs_port)
+73,88c63,67
+< servermanager.ProxyManager().DisableStateUpdateNotification()
+< servermanager.ProxyManager().UpdateFromRemote()
+< tk = servermanager.ProxyManager().GetProxy("timekeeper", "TimeKeeper")
+< if not tk:
+< tk = servermanager.misc.TimeKeeper()
+< servermanager.ProxyManager().RegisterProxy("timekeeper", "TimeKeeper", tk)
+<
+< scene = servermanager.ProxyManager().GetProxy("animation", "AnimationScene")
+< if not scene:
+< scene = AnimationScene()
+< scene.TimeKeeper = tk
+<
+< servermanager.ProxyManager().EnableStateUpdateNotification()
+< servermanager.ProxyManager().TriggerStateUpdate()
+<
+< return connection
+---
+> tk = servermanager.misc.TimeKeeper()
+> servermanager.ProxyManager().RegisterProxy("timekeeper", "tk", tk)
+> scene = AnimationScene()
+> scene.TimeKeeper = tk
+> return session
+93,94c72,73
+< Disconnect(globals(), False)
+< connection = servermanager.ReverseConnect(port)
+---
+> _disconnect()
+> session = servermanager.ReverseConnect(port)
+96,112c75,79
+<
+< servermanager.ProxyManager().DisableStateUpdateNotification()
+< servermanager.ProxyManager().UpdateFromRemote()
+< tk = servermanager.ProxyManager().GetProxy("timekeeper", "TimeKeeper")
+< if not tk:
+< tk = servermanager.misc.TimeKeeper()
+< servermanager.ProxyManager().RegisterProxy("timekeeper", "TimeKeeper", tk)
+<
+< scene = servermanager.ProxyManager().GetProxy("animation", "AnimationScene")
+< if not scene:
+< scene = AnimationScene()
+< scene.TimeKeeper = tk
+<
+< servermanager.ProxyManager().EnableStateUpdateNotification()
+< servermanager.ProxyManager().TriggerStateUpdate()
+<
+< return connection
+---
+> tk = servermanager.misc.TimeKeeper()
+> servermanager.ProxyManager().RegisterProxy("timekeeper", "tk", tk)
+> scene = AnimationScene()
+> scene.TimeKeeper = tk
+> return session
+121c88
+<
+---
+>
+161a129,131
+> reader_factor = servermanager.ProxyManager().GetReaderFactory()
+> if reader_factor.GetNumberOfRegisteredPrototypes() == 0:
+> reader_factor.RegisterPrototypes("sources")
+163,165d132
+< reader_factor = servermanager.vtkSMProxyManager.GetProxyManager().GetReaderFactory()
+< if reader_factor.GetNumberOfRegisteredPrototypes() == 0:
+< reader_factor.RegisterPrototypes(session, "sources")
+170,171c137
+< msg = "File not readable: %s " % first_file
+< raise RuntimeError, msg
+---
+> raise RuntimeError, "File not readable: %s " % first_file
+173,174c139
+< msg = "File not readable. No reader found for '%s' " % first_file
+< raise RuntimeError, msg
+---
+> raise RuntimeError, "File not readable. No reader found for '%s' " % first_file
+192,193c157
+< session = servermanager.ActiveConnection.Session
+< writer_factory = servermanager.vtkSMProxyManager.GetProxyManager().GetWriterFactory()
+---
+> writer_factory = servermanager.ProxyManager().GetWriterFactory()
+195c159
+< writer_factory.RegisterPrototypes(session, "writers")
+---
+> writer_factory.RegisterPrototypes("writers")
+441c405,406