Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-09 03:23:47 +02:00
Code Issues Projects Releases Wiki Activity

Sync to trunk.

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/recipes/biggovernment.recipe
View file

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

2
resources/recipes/propublica.recipe
View file

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

3
src/calibre/devices/eb600/driver.py
View file

@ -92,7 +92,8 @@ def can_handle(cls, dev, debug=False):
if not iswindows:
return dev[4] == 'ShineBook'
except:
return True
pass
return True

3
src/calibre/devices/usbms/device.py
View file

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