From 858cec547bea1acfdd89dbd7efad95e4cf5fb242 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Sun, 14 Feb 2010 15:42:04 +0100 Subject: [PATCH] [imp] merge nested tests in _dttime_format.__str__ bzr revid: xmo@tinyerp.com-20100214144204-0ary7dqew73j3jmr --- bin/report/report_sxw.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/report/report_sxw.py b/bin/report/report_sxw.py index 9716f15540d..f06f190f7af 100644 --- a/bin/report/report_sxw.py +++ b/bin/report/report_sxw.py @@ -119,11 +119,10 @@ class _dttime_format(str, _format): self.val = value and str(value) or '' def __str__(self): - if self.val: - if getattr(self,'name', None): - return datetime.strptime(self.name, DHM_FORMAT)\ - .strftime("%s %s"%(self.lang_obj.date_format, - self.lang_obj.time_format)) + if self.val and getattr(self,'name', None): + return datetime.strptime(self.name, DHM_FORMAT)\ + .strftime("%s %s"%(self.lang_obj.date_format, + self.lang_obj.time_format)) return self.val