From 583685933d00d9f8d58f684f3315164d20a56f4e Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Sun, 8 May 2011 18:04:23 +0200
Subject: [PATCH 1/3] Fixed by ensuring the dates are in local time instead of
 UTC

---
 src/calibre/gui2/metadata/basic_widgets.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/gui2/metadata/basic_widgets.py b/src/calibre/gui2/metadata/basic_widgets.py
index 8858f9c986..d662256def 100644
--- a/src/calibre/gui2/metadata/basic_widgets.py
+++ b/src/calibre/gui2/metadata/basic_widgets.py
@@ -1126,7 +1126,7 @@ class DateEdit(QDateEdit): # {{{
     @dynamic_property
     def current_val(self):
         def fget(self):
-            return qt_to_dt(self.date())
+            return qt_to_dt(self.date(), as_utc=False)
         def fset(self, val):
             if val is None:
                 val = UNDEFINED_DATE

From cd6f43c13fd705a9f9a8f1689749f18bb05de59b Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 8 May 2011 17:06:14 -0600
Subject: [PATCH 2/3] Fix #779560 (iPad2 device ID not supported by apple
 driver)

---
 src/calibre/devices/apple/driver.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py
index cd0bbe2ace..922afc4338 100644
--- a/src/calibre/devices/apple/driver.py
+++ b/src/calibre/devices/apple/driver.py
@@ -205,7 +205,7 @@ class ITUNES(DriverBase):
     #  0x129a   iPad
     #  0x12a2   iPad2
     VENDOR_ID = [0x05ac]
-    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x12a2]
+    PRODUCT_ID = [0x1292,0x1293,0x1294,0x1297,0x1299,0x129a,0x129f,0x12a2]
     BCD = [0x01]
 
     # Plugboard ID

From a558cd0d2a5f88fe8a0e0c84896857a790c7ec8e Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sun, 8 May 2011 17:37:46 -0600
Subject: [PATCH 3/3] Ignore 'Unknown' author when downloading metadata. Fixes
 #779348 (metadata fails on unknown author)

---
 src/calibre/ebooks/metadata/sources/amazon.py | 2 +-
 src/calibre/ebooks/metadata/sources/base.py   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 8483698e28..31d815af63 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -338,7 +338,7 @@ class Amazon(Source):
                     q['field-author'] = ' '.join(author_tokens)
 
         if not ('field-keywords' in q or 'field-isbn' in q or
-                ('field-title' in q and 'field-author' in q)):
+                ('field-title' in q)):
             # Insufficient metadata to make an identify query
             return None
 
diff --git a/src/calibre/ebooks/metadata/sources/base.py b/src/calibre/ebooks/metadata/sources/base.py
index e74e4f5042..c20cb1db83 100644
--- a/src/calibre/ebooks/metadata/sources/base.py
+++ b/src/calibre/ebooks/metadata/sources/base.py
@@ -291,10 +291,10 @@ class Source(Plugin):
                     parts = parts[1:] + parts[:1]
                 for tok in parts:
                     tok = remove_pat.sub('', tok).strip()
-                    if len(tok) > 2 and tok.lower() not in ('von', ):
+                    if len(tok) > 2 and tok.lower() not in ('von', 'van',
+                            _('Unknown').lower()):
                         yield tok
 
-
     def get_title_tokens(self, title, strip_joiners=True, strip_subtitle=False):
         '''
         Take a title and return a list of tokens useful for an AND search query.