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

Timestamp:

Sep 20, 2017 10:21:41 AM (7 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:

fca1f50

Parents:

2746eab (diff), ce0a245 (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 ticket-639-katex

File:

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

src/sas/sasgui/guiframe/documentation_window.py

@@ -99 +99 @@
         elif not os.path.exists(file_path):
             url = "index.html"
-            logger.error("Could not find Sphinx documentation at %s \
-            -- has it been built?", file_path)
+            logger.error("Could not find Sphinx documentation at %s -- has it been built?",
+                         file_path)
         elif False:
             start_documentation_server(docs_path, port=7999)
@@ -107 +107 @@
             url = "file:///" + urllib.quote(file_path, r'/\:')+ url_instruction
 
-        logger.info("showing url " + url)
+        #logger.info("showing url " + url)
         if WX_SUPPORTS_HTML2:
             # Complete HTML/CSS support!