diff options
Diffstat (limited to 'doc/_extensions')
| -rw-r--r-- | doc/_extensions/github_link.py | 4 | ||||
| -rw-r--r-- | doc/_extensions/odoo_ext/translator.py | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/doc/_extensions/github_link.py b/doc/_extensions/github_link.py index 72d51bfeb60..8f7a0084039 100644 --- a/doc/_extensions/github_link.py +++ b/doc/_extensions/github_link.py @@ -4,8 +4,6 @@ import os.path from werkzeug import urls -from odoo.tools import pycompat - """ * adds github_link(mode) context variable: provides URL (in relevant mode) of current document on github @@ -100,7 +98,7 @@ def add_doc_link(app, pagename, templatename, context, doctree): # in 1.3 source_suffix can be a list # in 1.8 source_suffix can be a mapping # FIXME: will break if we ever add support for !rst markdown documents maybe - if not isinstance(source_suffix, pycompat.string_types): + if not isinstance(source_suffix, str): source_suffix = next(iter(source_suffix)) # can't use functools.partial because 3rd positional is line not mode context['github_link'] = lambda mode='edit': make_github_link( diff --git a/doc/_extensions/odoo_ext/translator.py b/doc/_extensions/odoo_ext/translator.py index 491f02a2ad3..211159e219c 100644 --- a/doc/_extensions/odoo_ext/translator.py +++ b/doc/_extensions/odoo_ext/translator.py @@ -13,8 +13,6 @@ from docutils import nodes from sphinx import addnodes, util from sphinx.locale import admonitionlabels -from odoo.tools import pycompat - def _parents(node): while node.parent: @@ -66,7 +64,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): self.param_separator = ',' def encode(self, text): - return pycompat.text_type(text).translate({ + return str(text).translate({ ord('&'): u'&', ord('<'): u'<', ord('"'): u'"', @@ -75,7 +73,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): }) def starttag(self, node, tagname, **attributes): - tagname = pycompat.text_type(tagname).lower() + tagname = str(tagname).lower() # extract generic attributes attrs = {name.lower(): value for name, value in attributes.items()} @@ -110,7 +108,7 @@ class BootstrapTranslator(nodes.NodeVisitor, object): # only "space characters" SPACE, CHARACTER TABULATION, LINE FEED, # FORM FEED and CARRIAGE RETURN should be collapsed, not al White_Space def attval(self, value, whitespace=re.compile(u'[ \t\n\f\r]+')): - return self.encode(whitespace.sub(u' ', pycompat.text_type(value))) + return self.encode(whitespace.sub(' ', str(value))) def astext(self): return u''.join(self.body) |