From 25ab93133d1535b3b221fb4a771cfd3afcd30311 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Fri, 18 Nov 2011 13:09:45 +0100
Subject: [PATCH] Use "localtime" in clean_date_for_sort, which is more likely
 to be what the user is really looking at. Continue to use non-naive dates so
 that differences in DST are taken into account.

---
 src/calibre/utils/date.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/calibre/utils/date.py b/src/calibre/utils/date.py
index 0de50e4122..faac8795d4 100644
--- a/src/calibre/utils/date.py
+++ b/src/calibre/utils/date.py
@@ -291,6 +291,11 @@ def clean_date_for_sort(dt, format):
     if not isinstance(dt, datetime):
         dt = datetime.combine(dt, time())
 
+    if hasattr(dt, 'tzinfo'):
+        if dt.tzinfo is None:
+            dt = dt.replace(tzinfo=_local_tz)
+        dt = as_local_time(dt)
+
     if format == 'iso':
         format = 'yyMdhms'