Browse Source

[fix] pep8

Adam Tauber 11 years ago
parent
commit
b735093564
3 changed files with 26 additions and 15 deletions
  1. 9
    5
      searx/engines/google_news.py
  2. 12
    5
      searx/engines/yahoo_news.py
  3. 5
    5
      searx/webapp.py

+ 9
- 5
searx/engines/google_news.py View File

2
 
2
 
3
 from urllib import urlencode
3
 from urllib import urlencode
4
 from json import loads
4
 from json import loads
5
-from datetime import datetime, timedelta
5
+from datetime import datetime
6
 
6
 
7
 categories = ['news']
7
 categories = ['news']
8
 
8
 
33
 
33
 
34
     for result in search_res['responseData']['results']:
34
     for result in search_res['responseData']['results']:
35
 # S.149 (159), library.pdf
35
 # S.149 (159), library.pdf
36
-# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700", "%a, %d %b %Y %H:%M:%S %z")
36
+# datetime.strptime("Mon, 10 Mar 2014 16:26:15 -0700",
37
+#                   "%a, %d %b %Y %H:%M:%S %z")
37
 #        publishedDate = parse(result['publishedDate'])
38
 #        publishedDate = parse(result['publishedDate'])
38
-        publishedDate = datetime.strptime(str.join(' ',result['publishedDate'].split(None)[0:5]), "%a, %d %b %Y %H:%M:%S")
39
-        #utc_offset = timedelta(result['publishedDate'].split(None)[5])  # local = utc + offset
39
+        publishedDate = datetime.strptime(
40
+            str.join(' ', result['publishedDate'].split(None)[0:5]),
41
+            "%a, %d %b %Y %H:%M:%S")
42
+        #utc_offset = timedelta(result['publishedDate'].split(None)[5])
43
+        # local = utc + offset
40
         #publishedDate = publishedDate + utc_offset
44
         #publishedDate = publishedDate + utc_offset
41
 
45
 
42
         results.append({'url': result['unescapedUrl'],
46
         results.append({'url': result['unescapedUrl'],
43
                         'title': result['titleNoFormatting'],
47
                         'title': result['titleNoFormatting'],
44
-						'publishedDate': publishedDate,
48
+                        'publishedDate': publishedDate,
45
                         'content': result['content']})
49
                         'content': result['content']})
46
     return results
50
     return results

+ 12
- 5
searx/engines/yahoo_news.py View File

43
         publishedDate = extract_text(result.xpath(publishedDate_xpath)[0])
43
         publishedDate = extract_text(result.xpath(publishedDate_xpath)[0])
44
 
44
 
45
         if re.match("^[0-9]+ minute(s|) ago$", publishedDate):
45
         if re.match("^[0-9]+ minute(s|) ago$", publishedDate):
46
-            publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group()))
46
+            publishedDate = datetime.now() - timedelta(minutes=int(re.match(r'\d+', publishedDate).group()))  # noqa
47
         else:
47
         else:
48
-            if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$", publishedDate):
48
+            if re.match("^[0-9]+ hour(s|), [0-9]+ minute(s|) ago$",
49
+                        publishedDate):
49
                 timeNumbers = re.findall(r'\d+', publishedDate)
50
                 timeNumbers = re.findall(r'\d+', publishedDate)
50
-                publishedDate = datetime.now() - timedelta(hours=int(timeNumbers[0])) - timedelta(minutes=int(timeNumbers[1]))
51
+                publishedDate = datetime.now()\
52
+                    - timedelta(hours=int(timeNumbers[0]))\
53
+                    - timedelta(minutes=int(timeNumbers[1]))
51
             else:
54
             else:
52
                 # TODO year in string possible?
55
                 # TODO year in string possible?
53
-                publishedDate = datetime.strptime(publishedDate,"%b %d %H:%M%p")
56
+                publishedDate = datetime.strptime(publishedDate,
57
+                                                  "%b %d %H:%M%p")
54
 
58
 
55
         if publishedDate.year == 1900:
59
         if publishedDate.year == 1900:
56
             publishedDate = publishedDate.replace(year=datetime.now().year)
60
             publishedDate = publishedDate.replace(year=datetime.now().year)
57
 
61
 
58
-        results.append({'url': url, 'title': title, 'content': content,'publishedDate':publishedDate})
62
+        results.append({'url': url,
63
+                        'title': title,
64
+                        'content': content,
65
+                        'publishedDate': publishedDate})
59
 
66
 
60
     if not suggestion_xpath:
67
     if not suggestion_xpath:
61
         return results
68
         return results

+ 5
- 5
searx/webapp.py View File

32
     Flask, request, render_template, url_for, Response, make_response,
32
     Flask, request, render_template, url_for, Response, make_response,
33
     redirect, send_from_directory
33
     redirect, send_from_directory
34
 )
34
 )
35
-from flask.ext.babel import Babel, gettext, ngettext, format_date
35
+from flask.ext.babel import Babel, gettext, format_date
36
 from searx import settings, searx_dir
36
 from searx import settings, searx_dir
37
 from searx.engines import (
37
 from searx.engines import (
38
     search as do_search, categories, engines, get_engines_stats,
38
     search as do_search, categories, engines, get_engines_stats,
161
         if 'publishedDate' in result:
161
         if 'publishedDate' in result:
162
             if result['publishedDate'] >= datetime.now() - timedelta(days=1):
162
             if result['publishedDate'] >= datetime.now() - timedelta(days=1):
163
                 timedifference = datetime.now() - result['publishedDate']
163
                 timedifference = datetime.now() - result['publishedDate']
164
-                minutes = int((timedifference.seconds/60)%60)
165
-                hours = int(timedifference.seconds/60/60)
164
+                minutes = int((timedifference.seconds / 60) % 60)
165
+                hours = int(timedifference.seconds / 60 / 60)
166
                 if hours == 0:
166
                 if hours == 0:
167
-                    result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)
167
+                    result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)  # noqa
168
                 else:
168
                 else:
169
-                    result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)
169
+                    result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)  # noqa
170
             else:
170
             else:
171
                 result['publishedDate'] = format_date(result['publishedDate'])
171
                 result['publishedDate'] = format_date(result['publishedDate'])
172
 
172