Fix doc builds.

anntzer · anntzer · commit ab61783390f2 · 2018-01-08T22:27:56.000-08:00
diff --git a/doc/conf.py b/doc/conf.py
@@ -335,17 +335,8 @@ def _check_deps():
 ]
 
 
-class MyWX(MagicMock):
-    class Panel(object):
-        pass
-
-    class ToolBar(object):
-        pass
-
-    class Frame(object):
-        pass
-
-    VERSION_STRING = '2.9'
+class MyCairo(MagicMock):
+    version_info = (1, 2, 0)
 
 
 class MyPyQt4(MagicMock):
@@ -450,14 +441,25 @@ def getapi(*args):
         return 1
 
 
-mockwxversion = MagicMock()
-mockwx = MyWX()
-mocksip = MySip()
-mockpyqt4 = MyPyQt4()
-sys.modules['wxversion'] = mockwxversion
-sys.modules['wx'] = mockwx
-sys.modules['sip'] = mocksip
-sys.modules['PyQt4'] = mockpyqt4
+class MyWX(MagicMock):
+    class Panel(object):
+        pass
+
+    class ToolBar(object):
+        pass
+
+    class Frame(object):
+        pass
+
+    VERSION_STRING = '2.9'
+
+
+sys.modules['cairo'] = MyCairo()
+sys.modules['cairo'].__name__ = 'cairocffi'
+sys.modules['PyQt4'] = MyPyQt4()
+sys.modules['sip'] = MySip()
+sys.modules['wx'] = MyWX()
+sys.modules['wxversion'] = MagicMock()
 
 # numpydoc config
 
diff --git a/lib/matplotlib/backends/backend_cairo.py b/lib/matplotlib/backends/backend_cairo.py
@@ -19,8 +19,7 @@
 import numpy as np
 
 # In order to make it possible to pick the binding, use whichever has already
-# been imported, if any.  (The intermediate call to iter is just to placate
-# Python2.)
+# been imported, if any.
 cairo = next(
     (mod for mod in (
         sys.modules.get(name) for name in ["cairocffi", "cairo"]) if mod),
