From 3cf7c5f572a1c3f5519fcd02ae429ca71ed0aa2e Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 12 Nov 2008 11:55:48 -0800 Subject: [PATCH] Fix WSJ recipe --- src/calibre/ebooks/metadata/meta.py | 2 +- src/calibre/libunzip.py | 2 +- src/calibre/web/feeds/recipes/wsj.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py index 41e95dfcb7..b30691fbc2 100644 --- a/src/calibre/ebooks/metadata/meta.py +++ b/src/calibre/ebooks/metadata/meta.py @@ -111,7 +111,7 @@ def get_metadata(stream, stream_type='lrf', use_libprs_metadata=False): return base def get_comic_cover(stream, type): - extract_first = zip_extract_first if type == 'zip' else rar_extract_first + extract_first = zip_extract_first if type.lower() == 'cbz' else rar_extract_first ret = extract_first(stream) if ret is not None: path, data = ret diff --git a/src/calibre/libunzip.py b/src/calibre/libunzip.py index 6ec5d64313..55d71014a0 100644 --- a/src/calibre/libunzip.py +++ b/src/calibre/libunzip.py @@ -42,7 +42,7 @@ def extract(filename, dir): """ zf = zipfile.ZipFile( filename ) zf.extractall(dir) - + def extract_member(filename, match=re.compile(r'\.(jpg|jpeg|gif|png)\s*$', re.I)): zf = zipfile.ZipFile(filename) names = zf.namelist() diff --git a/src/calibre/web/feeds/recipes/wsj.py b/src/calibre/web/feeds/recipes/wsj.py index ec3bc6bb93..46ac696ad1 100644 --- a/src/calibre/web/feeds/recipes/wsj.py +++ b/src/calibre/web/feeds/recipes/wsj.py @@ -27,8 +27,8 @@ class WallStreetJournal(BasicNewsRecipe): def get_browser(self): br = BasicNewsRecipe.get_browser() if self.username is not None and self.password is not None: - br.open('http://online.wsj.com/login') - br.select_form(name='login_form') + br.open('http://commerce.wsj.com/auth/login') + br.select_form(nr=0) br['user'] = self.username br['password'] = self.password br.submit()