cubicweb: comparison cubicweb/uilib.py

equal deleted inserted replaced

-:6b3523f81f42
+:26744ad37953
 import csv
 import re
 from io import StringIO
-from six import PY2, PY3, text_type, binary_type, string_types, integer_types
 from logilab.mtconverter import xml_escape, html_unescape
 from logilab.common.date import ustrftime
 from cubicweb import _
 from cubicweb.utils import js_dumps
 if props is not None and value and props.get('internationalizable'):
 return req._(value)
 return value
 def print_int(value, req, props, displaytime=True):
-return text_type(value)
+return str(value)
 def print_date(value, req, props, displaytime=True):
 return ustrftime(value, req.property_value('ui.date-format'))
 def print_time(value, req, props, displaytime=True):
 _('%d hours')
 _('%d minutes')
 _('%d seconds')
 def print_timedelta(value, req, props, displaytime=True):
-if isinstance(value, integer_types):
+if isinstance(value, int):
 # `date - date`, unlike `datetime - datetime` gives an int
 # (number of days), not a timedelta
 # XXX should rql be fixed to return Int instead of Interval in
 #     that case? that would be probably the proper fix but we
 #     loose information on the way...
 if value:
 return req._('yes')
 return req._('no')
 def print_float(value, req, props, displaytime=True):
-return text_type(req.property_value('ui.float-format') % value) # XXX cast needed ?
+return str(req.property_value('ui.float-format') % value) # XXX cast needed ?
 PRINTERS = {
 'Bytes': print_bytes,
 'String': print_string,
 'Int': print_int,
 class _JSId(object):
 def __init__(self, id, parent=None):
 self.id = id
 self.parent = parent
-def __unicode__(self):
+def __str__(self):
 if self.parent:
 return u'%s.%s' % (self.parent, self.id)
-return text_type(self.id)
+return str(self.id)
-__str__ = __unicode__ if PY3 else lambda self: self.__unicode__().encode('utf-8')
 def __getattr__(self, attr):
 return _JSId(attr, self)
 def __call__(self, *args):
 return _JSCallArgs(args, self)
 class _JSCallArgs(_JSId):
 def __init__(self, args, parent=None):
 assert isinstance(args, tuple)
 self.args = args
 self.parent = parent
-def __unicode__(self):
+def __str__(self):
 args = []
 for arg in self.args:
 args.append(js_dumps(arg))
 if self.parent:
 return u'%s(%s)' % (self.parent, ','.join(args))
 return ','.join(args)
-__str__ = __unicode__ if PY3 else lambda self: self.__unicode__().encode('utf-8')
 class _JS(object):
 def __getattr__(self, attr):
 return _JSId(attr)
 HTML4_EMPTY_TAGS = frozenset(('base', 'meta', 'link', 'hr', 'br', 'param',
 'img', 'area', 'input', 'col'))
 def sgml_attributes(attrs):
-return u' '.join(u'%s="%s"' % (attr, xml_escape(text_type(value)))
+return u' '.join(u'%s="%s"' % (attr, xml_escape(str(value)))
 for attr, value in sorted(attrs.items())
 if value is not None)
 def simple_sgml_tag(tag, content=None, escapecontent=True, **attrs):
 """generation of a simple sgml tag (eg without children tags) easier
 except KeyError:
 pass
 value += u' ' + sgml_attributes(attrs)
 if content:
 if escapecontent:
-content = xml_escape(text_type(content))
+content = xml_escape(str(content))
 value += u'>%s</%s>' % (content, tag)
 else:
 if tag in HTML4_EMPTY_TAGS:
 value += u' />'
 else:
 from logilab.common.ureports import HTMLWriter
 formater = HTMLWriter(True)
 stream = StringIO() #UStringIO() don't want unicode assertion
 formater.format(layout, stream)
 res = stream.getvalue()
-if isinstance(res, binary_type):
+if isinstance(res, bytes):
 res = res.decode('UTF8')
 return res
 # traceback formatting ########################################################
 import traceback
 def exc_message(ex, encoding):
-if PY3:
+excmsg = str(ex)
-excmsg = str(ex)
-else:
-try:
-excmsg = unicode(ex)
-except Exception:
-try:
-excmsg = unicode(str(ex), encoding, 'replace')
-except Exception:
-excmsg = unicode(repr(ex), encoding, 'replace')
 exctype = ex.__class__.__name__
 return u'%s: %s' % (exctype, excmsg)
 def rest_traceback(info, exception):
 res = [u'Traceback\n---------\n::\n']
 for stackentry in traceback.extract_tb(info[2]):
 res.append(u'\tFile %s, line %s, function %s' % tuple(stackentry[:3]))
 if stackentry[3]:
 data = xml_escape(stackentry[3])
-if PY2:
-data = data.decode('utf-8', 'replace')
 res.append(u'\t  %s' % data)
 res.append(u'\n')
 try:
 res.append(u'\t Error: %s\n' % exception)
 except Exception:
 u'<b class="line">%s</b>, <b>function</b> '
 u'<b class="function">%s</b>:<br/>'%(
 xml_escape(stackentry[0]), stackentry[1], xml_escape(stackentry[2])))
 if stackentry[3]:
 string = xml_escape(stackentry[3])
-if PY2:
-string = string.decode('utf-8', 'replace')
 strings.append(u'&#160;&#160;%s<br/>\n' % (string))
 # add locals info for each entry
 try:
 local_context = tcbk.tb_frame.f_locals
 html_info = []
 def write(self, data):
 self.wfunc(data)
 def writerow(self, row):
-if PY3:
+self.writer.writerow(row)
-self.writer.writerow(row)
+return
-return
-csvrow = []
-for elt in row:
-if isinstance(elt, text_type):
-csvrow.append(elt.encode(self.encoding))
-else:
-csvrow.append(str(elt))
-self.writer.writerow(csvrow)
 def writerows(self, rows):
 for row in rows:
 self.writerow(row)
 self.maxsize = maxsize
 def __call__(self, function):
 def newfunc(*args, **kwargs):
 ret = function(*args, **kwargs)
-if isinstance(ret, string_types):
+if isinstance(ret, str):
 return ret[:self.maxsize]
 return ret
 return newfunc
 def htmlescape(function):
 def newfunc(*args, **kwargs):
 ret = function(*args, **kwargs)
-assert isinstance(ret, string_types)
+assert isinstance(ret, str)
 return xml_escape(ret)
 return newfunc

changeset 12567	26744ad37953
parent 12508	a8c1ea390400