[FIX] P3: text model types

* remove references to basestring & unicode (use relevant pycompat
  helpers)
* remove some str calls (either entirely or replaced by relevant
  helper, either text or native)
* use better API to avoid unnecessary conversions
* remove some XML declarations in views

3 files changed, 14 insertions, 7 deletions

diff --git a/addons/web_editor/controllers/main.py b/addons/web_editor/controllers/main.py
index c501ce769d2..50a9540323a 100644
--- a/addons/web_editor/controllers/main.py
+++ b/addons/web_editor/controllers/main.py
@@ -39,7 +39,7 @@ class Web_Editor(http.Controller):
             debug=request.debug)
 
         for k in kwargs:
-            if isinstance(kwargs[k], basestring) and kwargs[k].isdigit():
+            if isinstance(kwargs[k], pycompat.string_types) and kwargs[k].isdigit():
                 kwargs[k] = int(kwargs[k])
 
         trans = dict(
@@ -186,7 +186,7 @@ class Web_Editor(http.Controller):
                 uploads += attachments.read(['name', 'mimetype', 'checksum', 'url'])
             except Exception as e:
                 logger.exception("Failed to upload image to attachment")
-                message = unicode(e)
+                message = pycompat.text_type(e)
 
         return """<script type='text/javascript'>
             window.parent['%s'](%s, %s);
diff --git a/addons/web_editor/models/ir_qweb.py b/addons/web_editor/models/ir_qweb.py
index cd665f38833..4b1cd512e06 100644
--- a/addons/web_editor/models/ir_qweb.py
+++ b/addons/web_editor/models/ir_qweb.py
@@ -48,7 +48,10 @@ class QWeb(models.AbstractModel):
         el.set('t-call', el.attrib.pop('t-snippet'))
         name = self.env['ir.ui.view'].search([('key', '=', el.attrib.get('t-call'))]).display_name
         thumbnail = el.attrib.pop('t-thumbnail', "oe-thumbnail")
-        div = u'<div name="%s" data-oe-type="snippet" data-oe-thumbnail="%s">' % (escape(ir_qweb.unicodifier(name)), escape(ir_qweb.unicodifier(thumbnail)))
+        div = u'<div name="%s" data-oe-type="snippet" data-oe-thumbnail="%s">' % (
+            escape(pycompat.to_text(name)),
+            escape(pycompat.to_text(thumbnail))
+        )
         return [self._append(ast.Str(div))] + self._compile_node(el, options) + [self._append(ast.Str(u'</div>'))]
 
     def _compile_directive_install(self, el, options):
@@ -58,7 +61,11 @@ class QWeb(models.AbstractModel):
                 return []
             name = el.attrib.get('string') or 'Snippet'
             thumbnail = el.attrib.pop('t-thumbnail', 'oe-thumbnail')
-            div = u'<div name="%s" data-oe-type="snippet" data-module-id="%s" data-oe-thumbnail="%s"><section/></div>' % (escape(ir_qweb.unicodifier(name)), module.id, escape(ir_qweb.unicodifier(thumbnail)))
+            div = u'<div name="%s" data-oe-type="snippet" data-module-id="%s" data-oe-thumbnail="%s"><section/></div>' % (
+                escape(pycompat.to_text(name)),
+                module.id,
+                escape(pycompat.to_text(thumbnail))
+            )
             return [self._append(ast.Str(div))]
         else:
             return []
@@ -202,7 +209,7 @@ class DateTime(models.AbstractModel):
     def attributes(self, record, field_name, options, values):
         attrs = super(DateTime, self).attributes(record, field_name, options, values)
         value = record[field_name]
-        if isinstance(value, basestring):
+        if isinstance(value, pycompat.string_types):
             value = fields.Datetime.from_string(value)
         if value:
             # convert from UTC (server timezone) to user timezone
@@ -326,7 +333,7 @@ class Image(models.AbstractModel):
 
         img = '<img class="%s" src="%s" style="%s"%s%s/>' % \
             (classes, src, options.get('style', ''), ' alt="%s"' % alt if alt else '', ' data-zoom="1" data-zoom-image="%s"' % src_zoom if src_zoom else '')
-        return ir_qweb.unicodifier(img)
+        return pycompat.to_text(img)
 
     local_url_re = re.compile(r'^/(?P<module>[^]]+)/static/(?P<rest>.+)$')
 
diff --git a/addons/web_editor/models/ir_ui_view.py b/addons/web_editor/models/ir_ui_view.py
index 7cf9e2f3a27..96c27bc923d 100644
--- a/addons/web_editor/models/ir_ui_view.py
+++ b/addons/web_editor/models/ir_ui_view.py
@@ -127,7 +127,7 @@ class IrUiView(models.Model):
 
     @api.model
     def _view_obj(self, view_id):
-        if isinstance(view_id, basestring):
+        if isinstance(view_id, pycompat.string_types):
             return self.env.ref(view_id)
         elif isinstance(view_id, pycompat.integer_types):
             return self.browse(view_id)