From 40ca8557e9e25832afa40afd84124319cb71f87b Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 10 Oct 2017 13:29:11 +0200 Subject: [FIX] building documentation with P3 * fix P3 incompatibilities in doc/_extensions * vendor pyjsdoc, strip out everything we're not using and make what's left P3-compatible (upstream is not P3 compliant) * drop undeclared dependency on attrs as it turns out not to be much used --- doc/_extensions/autojsdoc/parser/utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc/_extensions/autojsdoc/parser/utils.py') diff --git a/doc/_extensions/autojsdoc/parser/utils.py b/doc/_extensions/autojsdoc/parser/utils.py index b8b1a97e7aa..213327f6c0e 100644 --- a/doc/_extensions/autojsdoc/parser/utils.py +++ b/doc/_extensions/autojsdoc/parser/utils.py @@ -104,7 +104,7 @@ def resolve(obj, store): if obj is None: return None - if isinstance(obj, (unicode, bool, int, float)): + if isinstance(obj, (type(u''), bool, int, float)): return obj if isinstance(obj, ModuleProxy): @@ -139,11 +139,11 @@ class Namespace(Resolvable): r = super(Namespace, self).resolve(store) self.attrs = { k: resolve(v, store) - for k, v in self.attrs.iteritems() + for k, v in self.attrs.items() } return r def __getitem__(self, key): - assert isinstance(key, unicode), "%r is not a namespace key" % key + assert isinstance(key, type(u'')), "%r is not a namespace key" % key try: return self.attrs[key] except KeyError: -- cgit v1.2.3