...

recipes/calgary_herald.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import Tag, BeautifulStoneSoup
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

recipes/edmonton_journal.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup, Tag
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -23,7 +18,7 @@ class CanWestPaper(BasicNewsRecipe):
         (u'Vancouver',u'/news/vancouver/index.html'),
         (u'Calgary',u'/news/calgary/index.html'),
         (u'Edmonton',u'/news/edmonton/index.html'),
-        (u'Montreal',u'/news/montreal/index.html'),,
+        (u'Montreal',u'/news/montreal/index.html'),
         (u'Fraser Valley',u'/news/fraser-valley/index.html'),
         (u'British Columbia',u'/news/bc/index.html'),
         (u'Alberta',u'/news/alberta/index.html'),
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

recipes/montreal_gazette.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup, Tag
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

recipes/ottawa_citizen.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup, Tag
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

recipes/vancouver_provice.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup, Tag
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

recipes/vancouver_sun.recipe

@@ -5,14 +5,9 @@ __license__   = 'GPL v3'
 '''
 www.canada.com
 '''
-import string, re
-from calibre import strftime
-from calibre.web.feeds.news import BasicNewsRecipe
-
-import string, re
-from calibre import strftime
+import re
 from calibre.web.feeds.recipes import BasicNewsRecipe
-from calibre.ebooks.BeautifulSoup import BeautifulSoup, Tag
+from calibre.ebooks.BeautifulSoup import BeautifulStoneSoup, Tag
 
 
 class CanWestPaper(BasicNewsRecipe):
@@ -135,7 +130,7 @@ class CanWestPaper(BasicNewsRecipe):
 
 
     def get_cover_url(self):
-        from datetime import timedelta, datetime, date
+        from datetime import timedelta, date
         cover = 'http://webmedia.newseum.org/newseum-multimedia/dfp/jpg'+str(date.today().day)+'/lg/'+self.fp_tag+'.jpg'
         br = BasicNewsRecipe.get_browser()
         daysback=1
@@ -158,7 +153,6 @@ class CanWestPaper(BasicNewsRecipe):
 
     def prepare_masthead_image(self, path_to_image, out_path):
         if self.Kindle_Fire:
-            from calibre import fit_image
             from calibre.utils.magick import Image, create_canvas
             img = Image()
             img.open(path_to_image)

src/calibre/gui2/catalog/catalog_epub_mobi.py

@@ -123,7 +123,7 @@ class PluginWidget(QWidget,Ui_Form):
                     # Look up custom column friendly name
                     rule['field'] = self.eligible_custom_fields[rule['field']]['field']
                     if rule['pattern'] in [_('any value'),_('any date')]:
-                        rule_pattern = '.*'
+                        rule['pattern'] = '.*'
                     elif rule['pattern'] == _('unspecified'):
                         rule['pattern'] = 'None'
             if 'prefix' in rule:

src/calibre/gui2/store/opensearch_store.py

@@ -6,7 +6,6 @@ __license__ = 'GPL 3'
 __copyright__ = '2011, John Schember <john@nachtimwald.com>'
 __docformat__ = 'restructuredtext en'
 
-import mimetypes
 from contextlib import closing
 
 from lxml import etree