Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b7350935 authored by Adam Tauber's avatar Adam Tauber
Browse files

[fix] pep8

parent 1467a2e0

searx/engines/google_news.py

+9 −5
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 


from urllib import urlencode

from json import loads

from datetime import datetime, timedelta

from datetime import datetime



categories = ['news']
@@ -33,10 +33,14 @@ 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'],

searx/engines/yahoo_news.py

+12 −5
Original line number Diff line number Diff line
@@ -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

searx/webapp.py

+5 −5
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ from flask import ( 
    Flask, request, render_template, url_for, Response, make_response,

    redirect, send_from_directory

)

from flask.ext.babel import Babel, gettext, ngettext, format_date

from flask.ext.babel import Babel, gettext, format_date

from searx import settings, searx_dir

from searx.engines import (

    search as do_search, categories, engines, get_engines_stats,
@@ -164,9 +164,9 @@ def index(): 
                minutes = int((timedifference.seconds / 60) % 60)

                hours = int(timedifference.seconds / 60 / 60)

                if hours == 0:

                    result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)

                    result['publishedDate'] = gettext(u'{minutes} minute(s) ago').format(minutes=minutes)  # noqa

                else:

                    result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)

                    result['publishedDate'] = gettext(u'{hours} hour(s), {minutes} minute(s) ago').format(hours=hours, minutes=minutes)  # noqa

            else:

                result['publishedDate'] = format_date(result['publishedDate'])