From dc5e32ae0571fc8236a684958fc739fda0eb9587 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomasz=20D=C5=82ugosz?= Date: Mon, 8 Apr 2013 21:37:14 +0200 Subject: [PATCH] fix encoding and drm status --- src/calibre/customize/builtins.py | 1 + src/calibre/gui2/store/stores/koobe_plugin.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 883aba20f2..9d93d1e26a 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1473,6 +1473,7 @@ class StoreKoobeStore(StoreBase): description = u'Księgarnia internetowa oferuje ebooki (książki elektroniczne) w postaci plików epub, mobi i pdf.' actual_plugin = 'calibre.gui2.store.stores.koobe_plugin:KoobeStore' + drm_free_only = True headquarters = 'PL' formats = ['EPUB', 'MOBI', 'PDF'] diff --git a/src/calibre/gui2/store/stores/koobe_plugin.py b/src/calibre/gui2/store/stores/koobe_plugin.py index 0370e70666..c3c58532e6 100644 --- a/src/calibre/gui2/store/stores/koobe_plugin.py +++ b/src/calibre/gui2/store/stores/koobe_plugin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -from __future__ import (unicode_literals, division, absolute_import, print_function) +from __future__ import (division, absolute_import, print_function) store_version = 1 # Needed for dynamic plugin loading __license__ = 'GPL 3' @@ -42,7 +42,7 @@ class KoobeStore(BasicStoreConfig, StorePlugin): counter = max_results with closing(br.open(url, timeout=timeout)) as f: - doc = html.fromstring(f.read()) + doc = html.fromstring(f.read().decode('utf-8')) for data in doc.xpath('//div[@class="seach_result"]/div[@class="result"]'): if counter <= 0: break @@ -66,6 +66,6 @@ class KoobeStore(BasicStoreConfig, StorePlugin): s.price = price s.detail_item = 'http://koobe.pl' + id[1:] s.formats = formats.upper() - s.drm = SearchResult.DRM_UNKNOWN + s.drm = SearchResult.DRM_UNLOCKED yield s