Fix merging

sphinx/transforms/__init__.py

@@ -129,7 +129,7 @@ class CitationReferences(Transform):
     def apply(self):
         for citnode in self.document.traverse(nodes.citation_reference):
             cittext = citnode.astext()
-            refnode = addnodes.pending_xref(cittext, reftype='citation',
+            refnode = addnodes.pending_xref(cittext, refdomain='std', reftype='citation',
                                             reftarget=cittext, refwarn=True,
                                             ids=citnode["ids"])
             refnode.source = citnode.source or citnode.parent.source

tests/test_ext_inheritance_diagram.py

@@ -9,6 +9,7 @@
     :license: BSD, see LICENSE for details.
 """
 
+import re
 import sys
 from util import with_app, rootdir, raises
 from test_ext_graphviz import skip_if_graphviz_not_found