From 97ac61706d1b04b7d450611e2b6bdeb1fc16a7c6 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 6 Dec 2015 17:08:18 +0100 Subject: [PATCH] Fix regression caused by closing the EU amazon stores --- src/calibre/gui2/store/stores/amazon_de_plugin.py | 9 ++++++--- src/calibre/gui2/store/stores/amazon_es_plugin.py | 9 ++++++--- src/calibre/gui2/store/stores/amazon_fr_plugin.py | 9 ++++++--- src/calibre/gui2/store/stores/amazon_it_plugin.py | 9 ++++++--- src/calibre/gui2/store/stores/amazon_uk_plugin.py | 9 ++++++--- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/src/calibre/gui2/store/stores/amazon_de_plugin.py b/src/calibre/gui2/store/stores/amazon_de_plugin.py index d9e23fdbc2..bf1896dcdb 100644 --- a/src/calibre/gui2/store/stores/amazon_de_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_de_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 9 # Needed for dynamic plugin loading +store_version = 10 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -27,8 +27,11 @@ class AmazonDEKindleStore(StorePlugin): def search(self, query, max_results=10, timeout=60): s = SearchResult() - s.title = 'Amazon demanded that this
store be permanently closed.' - s.author = None + s.title = 'Amazon required that this
store be permanently closed.' + s.author = '' + s.price = '' + s.detail_item = '' + s.drm = SearchResult.DRM_UNKNOWN yield s def get_details(self, search_result, timeout): diff --git a/src/calibre/gui2/store/stores/amazon_es_plugin.py b/src/calibre/gui2/store/stores/amazon_es_plugin.py index 0c77c1b54e..8e434f9e04 100644 --- a/src/calibre/gui2/store/stores/amazon_es_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_es_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 9 # Needed for dynamic plugin loading +store_version = 10 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -27,8 +27,11 @@ class AmazonESKindleStore(StorePlugin): def search(self, query, max_results=10, timeout=60): s = SearchResult() - s.title = 'Amazon demanded that this
store be permanently closed.' - s.author = None + s.title = 'Amazon required that this
store be permanently closed.' + s.author = '' + s.price = '' + s.detail_item = '' + s.drm = SearchResult.DRM_UNKNOWN yield s def get_details(self, search_result, timeout): diff --git a/src/calibre/gui2/store/stores/amazon_fr_plugin.py b/src/calibre/gui2/store/stores/amazon_fr_plugin.py index 56b7589acf..24d9f13f28 100644 --- a/src/calibre/gui2/store/stores/amazon_fr_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_fr_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 9 # Needed for dynamic plugin loading +store_version = 10 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -27,8 +27,11 @@ class AmazonFRKindleStore(StorePlugin): def search(self, query, max_results=10, timeout=60): s = SearchResult() - s.title = 'Amazon demanded that this
store be permanently closed.' - s.author = None + s.title = 'Amazon required that this
store be permanently closed.' + s.author = '' + s.price = '' + s.detail_item = '' + s.drm = SearchResult.DRM_UNKNOWN yield s def get_details(self, search_result, timeout): diff --git a/src/calibre/gui2/store/stores/amazon_it_plugin.py b/src/calibre/gui2/store/stores/amazon_it_plugin.py index d0e7f0aadc..fd44895ca6 100644 --- a/src/calibre/gui2/store/stores/amazon_it_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_it_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 9 # Needed for dynamic plugin loading +store_version = 10 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -27,8 +27,11 @@ class AmazonITKindleStore(StorePlugin): def search(self, query, max_results=10, timeout=60): s = SearchResult() - s.title = 'Amazon demanded that this
store be permanently closed.' - s.author = None + s.title = 'Amazon required that this
store be permanently closed.' + s.author = '' + s.price = '' + s.detail_item = '' + s.drm = SearchResult.DRM_UNKNOWN yield s def get_details(self, search_result, timeout): diff --git a/src/calibre/gui2/store/stores/amazon_uk_plugin.py b/src/calibre/gui2/store/stores/amazon_uk_plugin.py index 12a7a618b1..69e5d6ef21 100644 --- a/src/calibre/gui2/store/stores/amazon_uk_plugin.py +++ b/src/calibre/gui2/store/stores/amazon_uk_plugin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import (unicode_literals, division, absolute_import, print_function) -store_version = 9 # Needed for dynamic plugin loading +store_version = 10 # Needed for dynamic plugin loading __license__ = 'GPL 3' __copyright__ = '2011, John Schember ' @@ -29,8 +29,11 @@ class AmazonUKKindleStore(StorePlugin): def search(self, query, max_results=10, timeout=60): s = SearchResult() - s.title = 'Amazon demanded that this
store be permanently closed.' - s.author = None + s.title = 'Amazon required that this
store be permanently closed.' + s.author = '' + s.price = '' + s.detail_item = '' + s.drm = SearchResult.DRM_UNKNOWN yield s def get_details(self, search_result, timeout):