From 88dbbefa7b40bc5ddaf8baa829c65dbc8bcb0fd3 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Fri, 20 Feb 2015 18:24:42 +0530
Subject: [PATCH] Get rid of cssselect in the amazon metadata download plugin

---
 src/calibre/ebooks/metadata/sources/amazon.py | 22 +++++--------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/calibre/ebooks/metadata/sources/amazon.py b/src/calibre/ebooks/metadata/sources/amazon.py
index 2d9870e745..105cc42105 100644
--- a/src/calibre/ebooks/metadata/sources/amazon.py
+++ b/src/calibre/ebooks/metadata/sources/amazon.py
@@ -19,11 +19,6 @@ from calibre.ebooks.metadata.sources.base import (Source, Option, fixcase,
 from calibre.ebooks.metadata.book.base import Metadata
 from calibre.utils.localization import canonicalize_lang
 
-def CSSSelect(expr):
-    from cssselect import HTMLTranslator
-    from lxml.etree import XPath
-    return XPath(HTMLTranslator().css_to_xpath(expr))
-
 class Worker(Thread):  # Get details {{{
 
     '''
@@ -269,6 +264,8 @@ class Worker(Thread):  # Get details {{{
             self.log.error(msg)
             return
 
+        from css_selectors import Select
+        self.selector = Select(root)
         self.parse_details(oraw, root)
 
     def parse_details(self, raw, root):
@@ -337,7 +334,7 @@ class Worker(Thread):  # Get details {{{
             self.log.exception('Error parsing cover for url: %r'%self.url)
         mi.has_cover = bool(self.cover_url)
 
-        non_hero = CSSSelect('div#bookDetails_container_div div#nonHeroSection')(root)
+        non_hero = tuple(self.selector('div#bookDetails_container_div div#nonHeroSection'))
         if non_hero:
             # New style markup
             try:
@@ -417,9 +414,9 @@ class Worker(Thread):  # Get details {{{
         return ans
 
     def parse_authors(self, root):
-        matches = CSSSelect('#byline .author .contributorNameID')(root)
+        matches = tuple(self.selector('#byline .author .contributorNameID'))
         if not matches:
-            matches = CSSSelect('#byline .author a.a-link-normal')(root)
+            matches = tuple(self.selector('#byline .author a.a-link-normal'))
         if matches:
             authors = [self.totext(x) for x in matches]
             return [a for a in authors if a]
@@ -490,7 +487,7 @@ class Worker(Thread):  # Get details {{{
 
     def parse_comments(self, root):
         ans = ''
-        ns = CSSSelect('#bookDescription_feature_div noscript')(root)
+        ns = tuple(self.selector('#bookDescription_feature_div noscript'))
         if ns:
             ns = ns[0]
             if len(ns) == 0 and ns.text:
@@ -1125,13 +1122,6 @@ if __name__ == '__main__':  # tests {{{
                     authors_test(['F. Scott Fitzgerald'])]
             ),
 
-            (  # A newer book
-                {'identifiers':{'amazon': 'B004JHY6OG'}},
-                [title_test('The Heroes', exact=False),
-                    authors_test(['Joe Abercrombie'])]
-
-            ),
-
     ]  # }}}
 
     de_tests = [  # {{{