IGN:Tag release

resources/recipes/variety.recipe

@@ -1,46 +1,46 @@
-__license__   = 'GPL v3'
+__license__   = 'GPL v3'
-__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
+__copyright__ = '2009-2010, Darko Miletic <darko.miletic at gmail.com>'
-'''
+'''
-www.variety.com
+www.variety.com
-'''
+'''
-
+
-from calibre.web.feeds.recipes import BasicNewsRecipe
+from calibre.web.feeds.recipes import BasicNewsRecipe
-
+
-class Variety(BasicNewsRecipe):
+class Variety(BasicNewsRecipe):
-    title                  = 'Variety'
+    title                  = 'Variety'
-    __author__             = 'Darko Miletic'
+    __author__             = 'Darko Miletic'
-    description            = 'Breaking entertainment movie news, movie reviews, entertainment industry events, news and reviews from Cannes, Oscars, and Hollywood awards.  Featuring box office charts, archives and more.'
+    description            = 'Breaking entertainment movie news, movie reviews, entertainment industry events, news and reviews from Cannes, Oscars, and Hollywood awards.  Featuring box office charts, archives and more.'
-    oldest_article         = 2
+    oldest_article         = 2
-    max_articles_per_feed  = 100
+    max_articles_per_feed  = 100
-    no_stylesheets         = True
+    no_stylesheets         = True
-    use_embedded_content   = False
+    use_embedded_content   = False
-    encoding               = 'cp1252'
+    encoding               = 'cp1252'
-    publisher              = 'Red Business Information'
+    publisher              = 'Red Business Information'
-    category               = 'Entertainment Industry News, Daily Variety, Movie Reviews, TV, Awards, Oscars, Cannes, Box Office, Hollywood'
+    category               = 'Entertainment Industry News, Daily Variety, Movie Reviews, TV, Awards, Oscars, Cannes, Box Office, Hollywood'
-    language               = 'en'
+    language               = 'en'
-    masthead_url           = 'http://a330.g.akamai.net/7/330/23382/20090528190853/www.variety.com/graphics/variety/Variety_logo_green_tm.gif'
+    masthead_url           = 'http://a330.g.akamai.net/7/330/23382/20090528190853/www.variety.com/graphics/variety/Variety_logo_green_tm.gif'
-    extra_css              = ' body{font-family: Georgia,"Times New Roman",Times,Courier,serif } img{margin-bottom: 1em} '
+    extra_css              = ' body{font-family: Georgia,"Times New Roman",Times,Courier,serif } img{margin-bottom: 1em} '
-
+
-    conversion_options = {  
+    conversion_options = {
-                             'comments'  : description
+                             'comments'  : description
-                            ,'tags'      : category
+                            ,'tags'      : category
-                            ,'language'  : language
+                            ,'language'  : language
-                            ,'publisher' : publisher
+                            ,'publisher' : publisher
-                         }
+                         }
-
+
-    remove_tags = [dict(name=['object','link','map'])]
+    remove_tags = [dict(name=['object','link','map'])]
-
+
-    keep_only_tags = [dict(name='div', attrs={'id':'article'})]
+    keep_only_tags = [dict(name='div', attrs={'id':'article'})]
-                  
+
-    feeds = [(u'News & Articles', u'http://feeds.feedburner.com/variety/headlines' )]
+    feeds = [(u'News & Articles', u'http://feeds.feedburner.com/variety/headlines' )]
-
+
-    def print_version(self, url):
+    def print_version(self, url):
-        rpt = url.rpartition('?')[0]
+        rpt = url.rpartition('?')[0]
-        artid = rpt.rpartition('/')[2]
+        artid = rpt.rpartition('/')[2]
-        catidr = url.rpartition('categoryid=')[2]
+        catidr = url.rpartition('categoryid=')[2]
-        catid = catidr.partition('&')[0]
+        catid = catidr.partition('&')[0]
-        return 'http://www.variety.com/index.asp?layout=print_story&articleid=' + artid + '&categoryid=' + catid
+        return 'http://www.variety.com/index.asp?layout=print_story&articleid=' + artid + '&categoryid=' + catid
-
+
-
+
-    def preprocess_html(self, soup):
+    def preprocess_html(self, soup):
-        return self.adeify_images(soup)
+        return self.adeify_images(soup)

src/calibre/gui2/dialogs/search.py

@@ -5,7 +5,7 @@ from PyQt4.QtGui import QDialog
 
 from calibre.gui2.dialogs.search_ui import Ui_Dialog
 from calibre.gui2 import qstring_to_unicode
-from calibre.library.database2 import CONTAINS_MATCH, EQUALS_MATCH, REGEXP_MATCH
+from calibre.library.database2 import CONTAINS_MATCH, EQUALS_MATCH
 
 class SearchDialog(QDialog, Ui_Dialog):
 

src/calibre/utils/genshi/__init__.py

@@ -20,10 +20,7 @@ independently of where or how they are produced.
 """
 
 __docformat__ = 'restructuredtext en'
-try:
+__version__   = '0.5.0'
-    __version__ = __import__('pkg_resources').get_distribution('Genshi').version
-except:
-    pass
 
 from calibre.utils.genshi.core import *
 from calibre.utils.genshi.input import ParseError, XML, HTML