Changeset 26970b3 in sasview

Timestamp:

May 31, 2018 3:27:34 AM (6 years ago)

Author:

Piotr Rozyczko <rozyczko@…>

Branches:

ESS_GUI, 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

Children:

caefb8a

Parents:

eca7c6f

Message:

Fix for Sphinx crashing on importing QSyntaxHighlighter

Location:

src/sas/qtgui/Utilities

Files:

• ModelEditor.py (modified) (2 diffs)
• PluginDefinition.py (modified) (2 diffs)

src/sas/qtgui/Utilities/ModelEditor.py

@@ -1 +1 @@
 from PyQt5 import QtCore
 from PyQt5 import QtWidgets
-
-from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
 
 from sas.qtgui.Utilities.UI.ModelEditor import Ui_ModelEditor
@@ -26 +24 @@
         Here - just the highlighter connected to the text edit.
         """
+        # Weird import location - workaround for a bug in Sphinx choking on
+        # importing QSyntaxHighlighter
+        # DO NOT MOVE TO TOP
+        from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
         self.highlight = PythonHighlighter(self.txtEditor.document())
 

src/sas/qtgui/Utilities/PluginDefinition.py

@@ -4 +4 @@
 
 from sas.qtgui.Utilities.UI.PluginDefinitionUI import Ui_PluginDefinition
-from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
 
 # txtName
@@ -62 +61 @@
         txt_validator = QtGui.QRegExpValidator(rx)
         self.txtName.setValidator(txt_validator)
+        # Weird import location - workaround for a bug in Sphinx choking on
+        # importing QSyntaxHighlighter
+        # DO NOT MOVE TO TOP
+        from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter
         self.highlight = PythonHighlighter(self.txtFunction.document())