Changeset 4795 for trunk/GSASIIctrlGUI.py

Timestamp:

Feb 3, 2021 10:54:16 AM (2 years ago)

Author:

toby

Message:

work on docs

File:

• trunk/GSASIIctrlGUI.py (modified) (2 diffs)

trunk/GSASIIctrlGUI.py

@@ -138 +138 @@
     import matplotlib as mpl
 except ImportError:
-    pass
-    # Emulate 'wx' so this file can be imported
-    vals = ('TreeCtrl TextCtrl PyValidator Button ComboBox Choice CheckBox'.split() +
-            'Dialog ID_ANY OPEN'.split())
+    print('ImportError for wx/mpl in GSASIIctrlGUI: ignore if docs build')
+    # wx = Placeholder(vals)
+    # wxscroll = Placeholder(['ScrolledPanel'])
+    # if 'phoenix' in wx.version():
+    #     wg = Placeholder('Grid GridTableBase GridCellEditor'.split())
+    # else:
+    #     wg = Placeholder('Grid PyGridTableBase PyGridCellEditor'.split())
+
+
+# avoid "duplicate base class _MockObject" error in class G2LstCtrl():
+# where listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin are same
+# in docs build
+if listmix.ListCtrlAutoWidthMixin == listmix.ColumnSorterMixin:
+    print('Dummy out listmix classes for docs build')
     class Placeholder(object):
         def __init__(self, vals):
@@ -150 +160 @@
                 return object
             return Placeholder([])
-    # wx = Placeholder(vals)
-    # wxscroll = Placeholder(['ScrolledPanel'])
-    # if 'phoenix' in wx.version():
-    #     wg = Placeholder('Grid GridTableBase GridCellEditor'.split())
-    # else:
-    #     wg = Placeholder('Grid PyGridTableBase PyGridCellEditor'.split())
-    # # avoid "duplicate base class _MockObject" error in class G2LstCtrl():
-    # # where listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin are same
-    # # in docs build
+        
     listmix = Placeholder()
     listmix.ListCtrlAutoWidthMixin = Placeholder()