Merge branch 'py3' of https://github.com/eli-schwartz/calibre

src/calibre/gui2/store/search/models.py

@@ -291,9 +291,9 @@ class Matches(QAbstractItemModel):
         if not self.matches:
             return
         descending = order == Qt.DescendingOrder
-        self.all_matches.sort(None,
-            lambda x: sort_key(unicode_type(self.data_as_text(x, col))),
-            descending)
+        self.all_matches.sort(
+            key=lambda x: sort_key(unicode_type(self.data_as_text(x, col))),
+            reverse=descending)
         self.reorder_matches()
         if reset:
             self.beginResetModel(), self.endResetModel()

src/calibre/gui2/store/search/search.py

@@ -207,7 +207,7 @@ class SearchDialog(QDialog, Ui_Dialog):
         # there is a search. This way plugins closer
         # to a don't have an unfair advantage over
         # plugins further from a.
-        store_names = self.store_checks.keys()
+        store_names = list(self.store_checks)
         if not store_names:
             return
         # Remove all of our internal filtering logic from the query.

src/calibre/gui2/store/search_result.py

@@ -33,6 +33,9 @@ class SearchResult(object):
     def __eq__(self, other):
         return self.title == other.title and self.author == other.author and self.store_name == other.store_name and self.formats == other.formats
 
+    def __hash__(self):
+        return hash((self.title, self.author, self.store_name, self.formats))
+
     def __str__(self):
         items = []
         for x in 'store_name title author price formats detail_item cover_url'.split():

src/calibre/gui2/store/stores/amazon_au_plugin.py

@@ -47,7 +47,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_ca_plugin.py

@@ -47,7 +47,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_de_plugin.py

@@ -49,7 +49,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_es_plugin.py

@@ -49,7 +49,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_fr_plugin.py

@@ -49,7 +49,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_in_plugin.py

@@ -47,7 +47,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_it_plugin.py

@@ -49,7 +49,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_plugin.py

@@ -47,7 +47,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/amazon_uk_plugin.py

@@ -47,7 +47,7 @@ def search_amazon(query, max_results=10, timeout=60,
             x = x.encode('utf-8')
         return x
     uquery = {asbytes(k):asbytes(v) for k, v in uquery.items()}
-    url = base_url + '?' + urlencode(uquery).decode('ascii')
+    url = base_url + '?' + urlencode(uquery)
     br = browser(user_agent=get_user_agent())
 
     counter = max_results

src/calibre/gui2/store/stores/bn_plugin.py

@@ -40,7 +40,7 @@ class BNStore(BasicStoreConfig, StorePlugin):
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        url = 'http://www.barnesandnoble.com/s/%s?keyword=%s&store=ebook&view=list' % (query.replace(' ', '-'), quote_plus(query))
+        url = 'http://www.barnesandnoble.com/s/%s?keyword=%s&store=ebook&view=list' % (query.decode('utf-8').replace(' ', '-'), quote_plus(query))
 
         br = browser()
 

src/calibre/gui2/store/stores/woblink_plugin.py

@@ -36,7 +36,7 @@ def as_base64(data):
 
 
 def search(query, max_results=10, timeout=60):
-    url = 'http://woblink.com/publication/ajax?mode=none&query=' + quote_plus(query.encode('utf-8'))
+    url = 'http://woblink.com/publication/ajax?mode=none&query=' + quote_plus(query)
     if max_results > 10:
         if max_results > 20:
             url += '&limit=30'

src/calibre/gui2/store/stores/wolnelektury_plugin.py

@@ -44,7 +44,7 @@ class WolneLekturyStore(BasicStoreConfig, StorePlugin):
             d.exec_()
 
     def search(self, query, max_results=10, timeout=60):
-        url = 'http://wolnelektury.pl/szukaj?q=' + quote_plus(query.encode('utf-8'))
+        url = 'http://wolnelektury.pl/szukaj?q=' + quote_plus(query)
 
         br = browser()