diff options
| author | Fernando Borretti <eudoxiahp@gmail.com> | 2015-01-15 19:18:56 -0200 |
|---|---|---|
| committer | Fernando Borretti <eudoxiahp@gmail.com> | 2015-01-15 19:18:56 -0200 |
| commit | bef115ac8aa089d973ca3b8ebc73857877870a30 (patch) | |
| tree | 43ab10bcc3eed7d2197e5da12246137e8bd9d4b7 | |
| parent | ddadbfd99a049b86a2e087ecdc780f8515744361 (diff) | |
| download | paperbot-bef115ac8aa089d973ca3b8ebc73857877870a30.tar.gz paperbot-bef115ac8aa089d973ca3b8ebc73857877870a30.zip | |
Fix multiple statements in one line in modules.scihub
| -rw-r--r-- | modules/scihub.py | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/modules/scihub.py b/modules/scihub.py index caec0c7..ad0b10e 100644 --- a/modules/scihub.py +++ b/modules/scihub.py @@ -20,8 +20,10 @@ else: def cookie(fn): def _fn(*ar, **kw): - if "cookies" not in kw: kw["cookies"] = shcookie - elif scihub_cookie not in kw["cookies"]: kw["cookies"].update(shcookie) + if "cookies" not in kw: + kw["cookies"] = shcookie + elif scihub_cookie not in kw["cookies"]: + kw["cookies"].update(shcookie) return fn(*ar, **kw) return _fn @@ -70,7 +72,8 @@ def scihubber(url, **kwargs): re = requests.get(_url, **kwargs).text.encode("utf8") except Exception as exception: return None - if not re: return None + if not re: + return None shu = etree.parse(StringIO(re),etree.HTMLParser()) if not _doi: metas = map(lambda x:x.get("content"), shu.xpath("//meta[contains(@name,'doi')]")) @@ -80,13 +83,18 @@ def scihubber(url, **kwargs): ix = str.find(maybedoi[0],"10.") _doi = maybedoi[0][ix:] just = map(lambda x:x.get("src"), shu.xpath("//frame[@name='_pdf']")) - if just: return (just[0], _doi) + if just: + return (just[0], _doi) derp = map(lambda x:x.get("src"), shu.xpath("(//frame | //iframe)[contains(@src,'pdf')]")) derp += map(lambda x:x.get("href"), shu.xpath("//a[contains(@href,'pdf')]")) it = itertools.ifilter(None, itertools.imap(lambda x: _go("http://%s.sci-hub.org/%s" % (a.hostname, x), _doi), derp)) - try: return it.next() - except StopIteration: return None + try: + return it.next() + except StopIteration: + return None ret = _go(geturl) - if ret: return ret - else: return (None, None) + if ret: + return ret + else: + return (None, None) |