From 605dbf0fab6542d43f9f3bc5abcfdecd2c2a8be8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 11 Jun 2010 12:44:29 -0600 Subject: [PATCH] SONY driver: Fix generated timestamp in linux --- src/calibre/devices/prs505/sony_cache.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/prs505/sony_cache.py b/src/calibre/devices/prs505/sony_cache.py index 413d6959a6..fa4dd74b6d 100644 --- a/src/calibre/devices/prs505/sony_cache.py +++ b/src/calibre/devices/prs505/sony_cache.py @@ -12,7 +12,7 @@ from uuid import uuid4 from lxml import etree -from calibre import prints, guess_type, iswindows +from calibre import prints, guess_type, iswindows, islinux from calibre.devices.errors import DeviceError from calibre.devices.usbms.driver import debug_print from calibre.constants import DEBUG @@ -47,7 +47,10 @@ def strptime(src): src[2] = str(MONTH_MAP[src[2]]) return time.strptime(' '.join(src), '%w, %d %m %Y %H:%M:%S %Z') -def strftime(epoch, zone=time.gmtime): +def strftime(epoch, zone=None): + zone = time.gmtime + if islinux: + zone = time.localtime src = time.strftime("%w, %d %m %Y %H:%M:%S GMT", zone(epoch)).split() src[0] = INVERSE_DAY_MAP[int(src[0][:-1])]+',' src[2] = INVERSE_MONTH_MAP[int(src[2])]