Changeset 4793 for trunk

Timestamp:

Feb 3, 2021 10:32:14 AM (2 years ago)

Author:

toby

Message:

work on docs

Location:

trunk

Files:

• GSASIIplot.py (modified) (1 diff)
• docs/source/index.rst (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -132 +132 @@
     from scipy.ndimage.interpolation import map_coordinates
 except (ImportError, ValueError):
-    pass
+    # avoid "duplicate base class _MockObject" error in class G2LstCtrl():
+    # where listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin are same
+    # in docs build
+    class Placeholder(object):
+        def __init__(self):
+            self.Dialog = object
+    class Placeholder1(object): pass
+    listmix = Placeholder()
+    listmix.ListCtrlAutoWidthMixin = Placeholder()
+    listmix.ColumnSorterMixin = Placeholder1()
 import GSASIIpath
 Clip_on = GSASIIpath.GetConfigValue('Clip_on',True)

trunk/docs/source/index.rst

@@ -16 +16 @@
 and pages referenced there. 
 
-Contents
----------
 
 .. toctree::
@@ -43 +41 @@
     G2tools.rst
     indices.rst
+
+
+---------