Sync to trunk.

This commit is contained in:
John Schember 2010-01-01 14:37:53 -05:00
commit 3f51a67ebe
4 changed files with 5 additions and 5 deletions

View File

@ -3,7 +3,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class BigGovernmentRecipe(BasicNewsRecipe): class BigGovernmentRecipe(BasicNewsRecipe):
__license__ = 'GPL v3' __license__ = 'GPL v3'
__author__ = 'kwetal' __author__ = 'kwetal'
language = 'en_US' language = 'en'
version = 1 version = 1
title = u'Big Government' title = u'Big Government'

View File

@ -4,7 +4,7 @@ from calibre.web.feeds.news import BasicNewsRecipe
class ProPublicaRecipe(BasicNewsRecipe): class ProPublicaRecipe(BasicNewsRecipe):
__license__ = 'GPL v3' __license__ = 'GPL v3'
__author__ = 'kwetal' __author__ = 'kwetal'
language = 'en_US' language = 'en'
version = 1 version = 1
title = u'Pro Publica' title = u'Pro Publica'

View File

@ -92,6 +92,7 @@ class SHINEBOOK(EB600):
if not iswindows: if not iswindows:
return dev[4] == 'ShineBook' return dev[4] == 'ShineBook'
except: except:
pass
return True return True

View File

@ -869,8 +869,7 @@ class Device(DeviceConfig, DevicePlugin):
if special_tag is None: if special_tag is None:
from calibre.library.save_to_disk import get_components from calibre.library.save_to_disk import get_components
extra_components = get_components(template, mdata, fname, extra_components = get_components(template, mdata, fname)
replace_whitespace=True)
else: else:
tag = special_tag tag = special_tag
if tag.startswith(_('News')): if tag.startswith(_('News')):