# HG changeset patch # User Sylvain Thénault # Date 1278613133 -7200 # Node ID 6026582ae4f17f040a3df7b5f4f85ccc76f2e513 # Parent f84dba9b8eca763347383be35b9b205e2911eb58 [uilib] js objects implements __unicode__ diff -r f84dba9b8eca -r 6026582ae4f1 uilib.py --- a/uilib.py Thu Jul 08 19:18:56 2010 +0200 +++ b/uilib.py Thu Jul 08 20:18:53 2010 +0200 @@ -234,10 +234,12 @@ def __init__(self, id, parent=None): self.id = id self.parent = parent - def __str__(self): + def __unicode__(self): if self.parent: - return '%s.%s' % (self.parent, self.id) - return '%s' % self.id + return u'%s.%s' % (self.parent, self.id) + return unicode(self.id) + def __str__(self): + return unicode(self).encode('utf8') def __getattr__(self, attr): return _JSId(attr, self) def __call__(self, *args): @@ -248,10 +250,10 @@ assert isinstance(args, tuple) self.args = args self.parent = parent - def __str__(self): - args = ','.join(json_dumps(arg) for arg in self.args) + def __unicode__(self): + args = u','.join(json_dumps(arg) for arg in self.args) if self.parent: - return '%s(%s)' % (self.parent, args) + return u'%s(%s)' % (self.parent, args) return args class _JS(object):