Changeset 80c2c85 in sasview for src/sas/sasgui/guiframe/documentation_window.py

Timestamp:

Jun 28, 2016 5:10:33 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload

Children:

3aa2f3c

Parents:

899e084 (diff), 5552396 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into sasview-cleanup

File:

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

src/sas/sasgui/guiframe/documentation_window.py

@@ -16 +16 @@
 import os
 import logging
+import urllib
+
+import webbrowser
 import wx
-import webbrowser
-import urllib
-import sys
+
+from sas.sasgui import get_app_dir
 
 SPHINX_DOC_ENV = "SASVIEW_DOC_PATH"
@@ -27 +29 @@
 except:
     WX_SUPPORTS_HTML2 = False
-
-
-from gui_manager import get_app_dir