From 420a65cdad63b9dd0b33ae83941637b2a5e1b66d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Tue, 10 Sep 2013 14:50:15 +0200
Subject: [PATCH] [IMP] remove unneeded import, cases redundancy

bzr revid: xmo@openerp.com-20130910125015-75tjdv1eopipwk4m
---
 openerp/tools/qweb.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/openerp/tools/qweb.py b/openerp/tools/qweb.py
index 2250567ed5b..acd1a2a0610 100644
--- a/openerp/tools/qweb.py
+++ b/openerp/tools/qweb.py
@@ -1,7 +1,6 @@
 import cgi
 import logging
 import re
-import types
 
 #from openerp.tools.safe_eval import safe_eval as eval
 
@@ -320,15 +319,16 @@ class QWebXml(object):
         record, field = t_att["field"].rsplit('.', 1)
         record = self.eval_object(record, v)
 
-        inner = ""
+        inner = None
         field_type = record._model._all_columns[field].column._type
         try:
             if field_type == 'many2one':
                 field_data = record.read([field])[0].get(field)
-                inner = field_data and field_data[1] or ""
+                inner = field_data and field_data[1]
             else:
-                inner = getattr(record, field) or ""
-            if isinstance(inner, types.UnicodeType):
+                inner = getattr(record, field)
+
+            if isinstance(inner, unicode):
                 inner = inner.encode("utf8")
 
             if e.tagName != 't':
@@ -344,6 +344,6 @@ class QWebXml(object):
         except AttributeError:
             _logger.warning("t-field no field %s for model %s", field, record._model._name)
 
-        return self.render_element(e, t_att, g_att, v, str(inner))
+        return self.render_element(e, t_att, g_att, v, str(inner or ""))
 
 # leave this, al.