equal
deleted
inserted
replaced
48 __docformat__ = "restructuredtext en" |
48 __docformat__ = "restructuredtext en" |
49 from cubicweb import _ |
49 from cubicweb import _ |
50 |
50 |
51 from datetime import datetime |
51 from datetime import datetime |
52 |
52 |
|
53 from six import text_type |
|
54 |
53 from rql.nodes import VariableRef, Constant |
55 from rql.nodes import VariableRef, Constant |
54 |
56 |
55 from logilab.mtconverter import xml_escape |
57 from logilab.mtconverter import xml_escape |
56 from logilab.common.deprecation import deprecated |
58 from logilab.common.deprecation import deprecated |
57 |
59 |
190 return u'' |
192 return u'' |
191 entity = rset.get_entity(row, col) |
193 entity = rset.get_entity(row, col) |
192 return entity.printable_value(attrname, format='text/plain') |
194 return entity.printable_value(attrname, format='text/plain') |
193 elif col is None: # smart links disabled. |
195 elif col is None: # smart links disabled. |
194 def index_display(row): |
196 def index_display(row): |
195 return unicode(row) |
197 return text_type(row) |
196 elif self._cw.vreg.schema.eschema(rset.description[0][col]).final: |
198 elif self._cw.vreg.schema.eschema(rset.description[0][col]).final: |
197 def index_display(row): |
199 def index_display(row): |
198 return unicode(rset[row][col]) |
200 return text_type(rset[row][col]) |
199 else: |
201 else: |
200 def index_display(row): |
202 def index_display(row): |
201 return rset.get_entity(row, col).view('text') |
203 return rset.get_entity(row, col).view('text') |
202 return index_display |
204 return index_display |
203 |
205 |