summaryrefslogtreecommitdiff
path: root/doc/_extensions/autojsdoc/parser/jsdoc.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-10 19:14:30 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-10 19:14:30 +0200
commit0be264b29eac11a5dec5e6565d23d4ea86bd905a (patch)
tree79362f2340c89cb3cf2e8d8a467f357b7c7a8326 /doc/_extensions/autojsdoc/parser/jsdoc.py
parentcf753a7fdf1739dcf37d2ad74f4c8efb3d4ff3b3 (diff)
parente1104ac344cbc349a46b22339b13dfe9cbab8bcb (diff)
[MERGE] forward port branch 11.0 up to e1104ac344c
Diffstat (limited to 'doc/_extensions/autojsdoc/parser/jsdoc.py')
-rw-r--r--doc/_extensions/autojsdoc/parser/jsdoc.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/_extensions/autojsdoc/parser/jsdoc.py b/doc/_extensions/autojsdoc/parser/jsdoc.py
index 00406df42c1..a34a2aa9b83 100644
--- a/doc/_extensions/autojsdoc/parser/jsdoc.py
+++ b/doc/_extensions/autojsdoc/parser/jsdoc.py
@@ -174,7 +174,7 @@ class NSDoc(CommentDoc):
for p in self.get_as_list('property')
)
]
- return self.members.items() or self['_members'] or []
+ return list(self.members.items()) or self['_members'] or []
def has_property(self, name):
return self.get_property(name) is not None