Changes in src/sas/sasgui/guiframe/documentation_window.py [9d566b2:959eb01] in sasview

File:

• src/sas/sasgui/guiframe/documentation_window.py (modified) (3 diffs)

src/sas/sasgui/guiframe/documentation_window.py

@@ -16 +16 @@
 import os
 import logging
+import wx
 import webbrowser
 import urllib
 import sys
 
-import wx
-try:
-    import wx.html2 as html
-    WX_SUPPORTS_HTML2 = True
-except ImportError:
-    WX_SUPPORTS_HTML2 = False
-
-from .gui_manager import get_app_dir
-
 logger = logging.getLogger(__name__)
 
 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
+WX_SUPPORTS_HTML2 = True
+try:
+    import wx.html2 as html
+except:
+    WX_SUPPORTS_HTML2 = False
 
-THREAD_STARTED = False
-def start_documentation_server(doc_root, port):
-    import thread
-    global THREAD_STARTED
-    if not THREAD_STARTED:
-        thread.start_new_thread(_documentation_server, (doc_root, port))
-        THREAD_STARTED = True
 
-def _documentation_server(doc_root, port):
-    from SimpleHTTPServer import SimpleHTTPRequestHandler
-    from SocketServer import TCPServer
+from gui_manager import get_app_dir
 
-    os.chdir(doc_root)
-    httpd = TCPServer(("127.0.0.1", port), SimpleHTTPRequestHandler, bind_and_activate=False)
-    httpd.allow_reuse_address = True
-    try:
-        httpd.server_bind()
-        httpd.server_activate()
-        httpd.serve_forever()
-    finally:
-        httpd.server_close()
 
 class DocumentationWindow(wx.Frame):
@@ -91 +70 @@
         #Note added June 21, 2015     PDB
         file_path = os.path.join(docs_path, path)
-        if path.startswith('http'):
-            url = path
-        elif not os.path.exists(file_path):
-            url = "index.html"
+        url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction
+
+        if not os.path.exists(file_path):
             logger.error("Could not find Sphinx documentation at %s \
             -- has it been built?", file_path)
-        elif True:
-            start_documentation_server(docs_path, port=7999)
-            url = "http://localhost:7999/" + path.replace('\\', '/') + url_instruction
-        else:
-            url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction
-
-        logger.info("showing url " + url)
-        if WX_SUPPORTS_HTML2:
+        elif WX_SUPPORTS_HTML2:
             # Complete HTML/CSS support!
             self.view = html.WebView.New(self)
             self.view.LoadURL(url)
-            self.Bind(html.EVT_WEBVIEW_ERROR, self.OnError, self.view)
             self.Show()
         else:
@@ -118 +88 @@
             webbrowser.open_new_tab(url)
 
-    def OnError(self, evt):
-        logger.error("%d: %s", evt.GetInt(), evt.GetString())
-
 def main():
     """
     main loop function if running alone for testing.
     """
-    url = "index.html" if len(sys.argv) <= 1 else sys.argv[1]
     app = wx.App()
-    DocumentationWindow(None, -1, url, "", "Documentation",)
+    DocumentationWindow(None, -1, "index.html", "", "Documentation",)
     app.MainLoop()