Changeset 26970b3 in sasview


Ignore:
Timestamp:
May 31, 2018 3:27:34 AM (3 months ago)
Author:
Piotr Rozyczko <rozyczko@…>
Branches:
ESS_GUI, ESS_GUI_beta_approx, ESS_GUI_iss957, ESS_GUI_iss959, ESS_GUI_iss971, ESS_GUI_iss976
Children:
caefb8a
Parents:
eca7c6f
Message:

Fix for Sphinx crashing on importing QSyntaxHighlighter

Location:
src/sas/qtgui/Utilities
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • src/sas/qtgui/Utilities/ModelEditor.py

    r8b480d27 r26970b3  
    11from PyQt5 import QtCore 
    22from PyQt5 import QtWidgets 
    3  
    4 from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter 
    53 
    64from sas.qtgui.Utilities.UI.ModelEditor import Ui_ModelEditor 
     
    2624        Here - just the highlighter connected to the text edit. 
    2725        """ 
     26        # Weird import location - workaround for a bug in Sphinx choking on 
     27        # importing QSyntaxHighlighter 
     28        # DO NOT MOVE TO TOP 
     29        from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter 
    2830        self.highlight = PythonHighlighter(self.txtEditor.document()) 
    2931 
  • src/sas/qtgui/Utilities/PluginDefinition.py

    r3b8cc00 r26970b3  
    44 
    55from sas.qtgui.Utilities.UI.PluginDefinitionUI import Ui_PluginDefinition 
    6 from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter 
    76 
    87# txtName 
     
    6261        txt_validator = QtGui.QRegExpValidator(rx) 
    6362        self.txtName.setValidator(txt_validator) 
     63        # Weird import location - workaround for a bug in Sphinx choking on 
     64        # importing QSyntaxHighlighter 
     65        # DO NOT MOVE TO TOP 
     66        from sas.qtgui.Utilities.PythonSyntax import PythonHighlighter 
    6467        self.highlight = PythonHighlighter(self.txtFunction.document()) 
    6568 
Note: See TracChangeset for help on using the changeset viewer.