From 0c254d8d64f9de6e9de28279e0f33f69323a7141 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 22 May 2010 10:44:20 -0600 Subject: [PATCH] ... --- src/calibre/utils/date.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py index d81791a927..aa7714df2d 100644 --- a/src/calibre/utils/date.py +++ b/src/calibre/utils/date.py @@ -118,12 +118,8 @@ def utcnow(): def utcfromtimestamp(stamp): return datetime.utcfromtimestamp(stamp).replace(tzinfo=_utc_tz) -def format_date(dt, format, assume_utc=False, as_utc=False): +def format_date(dt, format): ''' Return a date formatted as a string using a subset of Qt's formatting codes ''' - if dt.tzinfo is None: - dt = dt.replace(tzinfo=_utc_tz if assume_utc else - _local_tz) - dt = dt.astimezone(_utc_tz if as_utc else _local_tz) strf = partial(strftime, t=dt.timetuple()) def format_day(mo):