[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

1 files changed, 2 insertions, 2 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 4efc3df9eec..9ac7b7a2fd8 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1396,7 +1396,7 @@ class CSVExport(ExportFormat, http.Controller):
         for data in rows:
             row = []
             for d in data:
-                if isinstance(d, unicode):
+                if type(d) != str and isinstance(d, pycompat.string_types):
                     try:
                         d = d.encode('utf-8')
                     except UnicodeError:
@@ -1446,7 +1446,7 @@ class ExcelExport(ExportFormat, http.Controller):
         for row_index, row in enumerate(rows):
             for cell_index, cell_value in enumerate(row):
                 cell_style = base_style
-                if isinstance(cell_value, basestring):
+                if isinstance(cell_value, pycompat.string_types):
                     cell_value = re.sub("\r", " ", cell_value)
                 elif isinstance(cell_value, datetime.datetime):
                     cell_style = datetime_style