[MERGE] forward port branch saas-11.5 up to 40430699dfb

2 files changed, 8 insertions, 2 deletions

diff --git a/doc/_extensions/autojsdoc/parser/jsdoc.py b/doc/_extensions/autojsdoc/parser/jsdoc.py
index ff6d3196254..eb9d595330a 100644
--- a/doc/_extensions/autojsdoc/parser/jsdoc.py
+++ b/doc/_extensions/autojsdoc/parser/jsdoc.py
@@ -62,6 +62,11 @@ class CommentDoc(pyjsdoc.CommentDoc):
         d['name'] = self.name
         return d
 
+    # don't resolve already resolved docs (e.g. a literal dict being
+    # include-ed in two different classes because I don't even care anymore
+    def become(self, modules):
+        return self
+
 class PropertyDoc(CommentDoc):
     @classmethod
     def from_param(cls, s, sourcemodule=None):
diff --git a/doc/_extensions/autojsdoc/parser/parser.py b/doc/_extensions/autojsdoc/parser/parser.py
index d979170bbc9..a5eb45a8e85 100644
--- a/doc/_extensions/autojsdoc/parser/parser.py
+++ b/doc/_extensions/autojsdoc/parser/parser.py
@@ -60,7 +60,7 @@ ref = collections.namedtuple('Ref', 'object property')
 def _name(r):
     bits = []
     while isinstance(r, ref):
-        bits.append(r.property)
+        bits.append(str(r.property))
         r = r.object
     return '.'.join(reversed(bits))
 def deref(item, prop=None):
@@ -348,7 +348,8 @@ class ModuleExtractor(Visitor):
             def resolve_extension(modules):
                 t = target.become(modules)
                 if not isinstance(t, jsdoc.ClassDoc):
-                    raise ValueError("include() subjects should be classes, %s is %s" % (target_name, type(t)))
+                    return # FIXME: log warning
+                    # raise ValueError("include() subjects should be classes, %s is %s" % (target_name, type(t)))
                 # TODO: note which module added these
                 for it in items:
                     if isinstance(it, dict):