Merge pull request #7006 from tacaswell/fix_bad_sphinx_merge

jenshnielsen · jenshnielsen · commit 0e03ff2c55ae · 2016-08-30T09:30:01.000+01:00
FIX: sphinx 1.4.0 details
diff --git a/lib/matplotlib/sphinxext/only_directives.py b/lib/matplotlib/sphinxext/only_directives.py
@@ -64,10 +64,12 @@ def visit_ignore(self, node):
     def depart_ignore(self, node):
         node.children = []
 
-    app.add_node(html_only, html=(visit_perform, depart_perform))
-    app.add_node(html_only, latex=(visit_ignore, depart_ignore))
-    app.add_node(latex_only, latex=(visit_perform, depart_perform))
-    app.add_node(latex_only, html=(visit_ignore, depart_ignore))
+    app.add_node(html_only,
+                 html=(visit_perform, depart_perform),
+                 latex=(visit_ignore, depart_ignore))
+    app.add_node(latex_only,
+                 latex=(visit_perform, depart_perform),
+                 html=(visit_ignore, depart_ignore))
 
     metadata = {'parallel_read_safe': True, 'parallel_write_safe': True}
     return metadata
