diff options
| author | Adam Tauber <asciimoo@gmail.com> | 2014-03-15 20:20:41 +0100 |
|---|---|---|
| committer | Adam Tauber <asciimoo@gmail.com> | 2014-03-15 20:20:41 +0100 |
| commit | b735093564d7ce6f67ccac39636a842b842c1b64 (patch) | |
| tree | e6597e8e8948d964fd497ee7e283921e1210858e /searx/engines | |
| parent | 1467a2e0fc860546ec2490a21db369fa50355c2e (diff) | |
[fix] pep8
Diffstat (limited to 'searx/engines')
| -rw-r--r-- | searx/engines/google_news.py | 14 | ||||
| -rw-r--r-- | searx/engines/yahoo_news.py | 17 |
2 files changed, 21 insertions, 10 deletions
diff --git a/searx/engines/google_news.py b/searx/engines/google_news.py index afda3e756..43ccaa3e3 100644 --- a/searx/engines/google_news.py +++ b/searx/engines/google_news.py @@ -2,7 +2,7 @@ from urllib import urlencode from json import loads -from datetime import datetime, timedelta +from datetime import datetime categories = ['news'] @@ -33,14 +33,18 @@ def response(resp): for result in search_res['responseData']['results']: # S.149 (159), library.pdf -# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700", "%a, %d %b %Y %H:%M:%S %z") +# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700", +# "%a, %d %b %Y %H:%M:%S %z") # publishedDate = parse(result['publishedDate']) - publishedDate = datetime.strptime(str.join(' ',result['publishedDate'].split(None)[0:5]), "%a, %d %b %Y %H:%M:%S") - #utc_offset = timedelta(result['publishedDate'].split(None)[5]) # local = utc + offset + publishedDate = datetime.strptime( + str.join(' ', result['publishedDate'].split(None)[0:5]), + "%a, %d %b %Y %H:%M:%S") + #utc_offset = timedelta(result['publishedDate'].split(None)[5]) + # local = utc + offset #publishedDate = publishedDate + utc_offset results.append({'url': result['unescapedUrl'], 'title': result['titleNoFormatting'], - 'publishedDate': publishedDate, + 'publishedDate': publishedDate, 'content': result['content']}) return results diff --git a/searx/engines/yahoo_news.py b/searx/engines/yahoo_news.py index 13a8a6024..a1e9df59c 100644 --- a/searx/engines/yahoo_news.py +++ b/searx/engines/yahoo_news.py @@ -43,19 +43,26 @@ def response(resp): publishedDate = extract_text(result.xpath(publishedDate_xpath)[0]) if re.match("^[0-9]+ minute(s|) ago$", publishedDate): - publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group())) + publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group())) # noqa else: - if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate): + if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", + publishedDate): timeNumbers = re.findall(r'\d+', publishedDate) - publishedDate = datetime.now() - timedelta(hours=int(timeNumbers[0])) - timedelta(minutes=int(timeNumbers[1])) + publishedDate = datetime.now()\ + - timedelta(hours=int(timeNumbers[0]))\ + - timedelta(minutes=int(timeNumbers[1])) else: # TODO year in string possible? - publishedDate = datetime.strptime(publishedDate,"%b %d %H:%M%p") + publishedDate = datetime.strptime(publishedDate, + "%b %d %H:%M%p") if publishedDate.year == 1900: publishedDate = publishedDate.replace(year=datetime.now().year) - results.append({'url': url, 'title': title, 'content': content,'publishedDate':publishedDate}) + results.append({'url': url, + 'title': title, + 'content': content, + 'publishedDate': publishedDate}) if not suggestion_xpath: return results |