Partially revert "Simplify XRefRole constructor"

1 files changed, 7 insertions, 2 deletions

diff --git a/sphinx/roles.py b/sphinx/roles.py
index eb3d14422..f78ae5887 100644
--- a/sphinx/roles.py
+++ b/sphinx/roles.py
@@ -68,14 +68,19 @@ class XRefRole:
     * Subclassing and overwriting `process_link()` and/or `result_nodes()`.
     """
 
+    nodeclass = addnodes.pending_xref  # type: Type[nodes.Node]
+    innernodeclass = nodes.literal
+
     def __init__(self, fix_parens=False, lowercase=False,
                  nodeclass=None, innernodeclass=None, warn_dangling=False):
         # type: (bool, bool, Type[nodes.Element], Type[nodes.TextElement], bool) -> None
         self.fix_parens = fix_parens
         self.lowercase = lowercase
         self.warn_dangling = warn_dangling
-        self.nodeclass = nodeclass or addnodes.pending_xref
-        self.innernodeclass = innernodeclass or nodes.literal
+        if nodeclass is not None:
+            self.nodeclass = nodeclass
+        if innernodeclass is not None:
+            self.innernodeclass = innernodeclass
 
     def _fix_parens(self, env, has_explicit_title, title, target):
         # type: (BuildEnvironment, bool, unicode, unicode) -> Tuple[unicode, unicode]