From b264c0742bb07a9e6728bf39935a73d263e1d984 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 2 Sep 2011 10:49:02 -0600
Subject: [PATCH] version 0.8.17

---
 Changelog.yaml                                | 50 +++++++++++++++++++
 src/calibre/constants.py                      |  2 +-
 .../gui2/store/stores/bookoteka_plugin.py     | 13 +++--
 3 files changed, 57 insertions(+), 8 deletions(-)

diff --git a/Changelog.yaml b/Changelog.yaml
index 7082c7416c..b3f5222ff5 100644
--- a/Changelog.yaml
+++ b/Changelog.yaml
@@ -19,6 +19,56 @@
 #  new recipes:
 #    - title: 
 
+- version: 0.8.17
+  date: 2011-09-02
+
+  new features:
+    - title: "Basic support for Amazon AZW4 format (PDF wrapped inside a MOBI)"
+
+    - title: "When showing the cover browser in a separate window, allow the use of the V, D shortcut keys to view the current book and send it to device respectively."
+      tickets: [836402]
+
+    - title: "Add an option in Preferences->Miscellaneous to abort conversion jobs that take too long."
+      tickets: [835233]
+
+    - title: "Driver for HTC Evo and HP TouchPad (with kindle app)"
+
+    - title: "Preferences->Adding books, detect when the user specifies a test expression with no file extension and popup a warning"
+  
+  bug fixes:
+    - title: "E-book viewer: Ensure toolbars are always visible"
+
+    - title: "Content server: Fix grouping of Tags/authors not working for some non english languages with Internet Explorer"
+      tickets: [835238]
+
+    - title: "When downloading metadata from amazon, fix italics inside brackets getting lost."
+      tickets: [836857]
+
+    - title: "Get Books: Add EscapeMagazine.pl and RW2010.pl stores"
+
+    - title: "Conversion pipeline: Fix conversion of cm/mm to pts. Fixes use of cm as a length unit when converting to MOBI."
+
+    - title: "When showing the cover browser in a separate window, focus the cover browser so that keyboard shortcuts work immediately."
+      tickets: [835933]
+
+    - title: "HTMLZ Output: Fix special chars like ampersands, etc. not being converted to entities"
+
+    - title: "Keyboard shortcuts config: Fix clicking done in the shortcut editor with shortcuts set to default caused the displayed shortcut to be always set to None"
+
+    - title: "Fix bottom most entries in keyboard shortcuts not editable"
+
+  improved recipes:
+    - Hacker News
+    - Nikkei News
+
+  new recipes:
+    - title: "Haber 7 and Hira"
+      authors: thomass
+
+    - title: "NTV and NTVSpor by A Erdogan"
+      author: A Erdogan
+
+
 - version: 0.8.16
   date: 2011-08-26
 
diff --git a/src/calibre/constants.py b/src/calibre/constants.py
index 592c9118d8..eb73cdc51c 100644
--- a/src/calibre/constants.py
+++ b/src/calibre/constants.py
@@ -4,7 +4,7 @@ __license__   = 'GPL v3'
 __copyright__ = '2008, Kovid Goyal kovid@kovidgoyal.net'
 __docformat__ = 'restructuredtext en'
 __appname__   = u'calibre'
-numeric_version = (0, 8, 16)
+numeric_version = (0, 8, 17)
 __version__   = u'.'.join(map(unicode, numeric_version))
 __author__    = u"Kovid Goyal <kovid@kovidgoyal.net>"
 
diff --git a/src/calibre/gui2/store/stores/bookoteka_plugin.py b/src/calibre/gui2/store/stores/bookoteka_plugin.py
index b0afd58f41..4df22060ed 100644
--- a/src/calibre/gui2/store/stores/bookoteka_plugin.py
+++ b/src/calibre/gui2/store/stores/bookoteka_plugin.py
@@ -6,7 +6,6 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, Tomasz Długosz <tomek3d@gmail.com>'
 __docformat__ = 'restructuredtext en'
 
-import re
 import urllib
 from contextlib import closing
 
@@ -24,7 +23,7 @@ from calibre.gui2.store.web_store_dialog import WebStoreDialog
 class BookotekaStore(BasicStoreConfig, StorePlugin):
 
     def open(self, parent=None, detail_item=None, external=False):
-        
+
         url = 'http://bookoteka.pl/ebooki'
         detail_url = None
 
@@ -41,16 +40,16 @@ class BookotekaStore(BasicStoreConfig, StorePlugin):
 
     def search(self, query, max_results=10, timeout=60):
         url = 'http://bookoteka.pl/list?search=' + urllib.quote_plus(query) + '&cat=1&hp=1&type=1'
-        
+
         br = browser()
-        
+
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read())
             for data in doc.xpath('//li[@class="EBOOK"]'):
                 if counter <= 0:
                     break
-                
+
                 id = ''.join(data.xpath('.//a[@class="item_link"]/@href'))
                 if not id:
                     continue
@@ -63,7 +62,7 @@ class BookotekaStore(BasicStoreConfig, StorePlugin):
                 formats = ', '.join(data.xpath('.//a[@class="fancybox protected"]/text()'))
 
                 counter -= 1
-                
+
                 s = SearchResult()
                 s.cover_url = 'http://bookoteka.pl' + cover_url
                 s.title = title.strip()
@@ -72,5 +71,5 @@ class BookotekaStore(BasicStoreConfig, StorePlugin):
                 s.detail_item = 'http://bookoteka.pl' + id.strip()
                 s.drm = SearchResult.DRM_UNLOCKED
                 s.formats = formats.strip()
-                
+
                 yield s