searx

commit: d7ea44ab8dd7f728ce19589b48618d7eb1669170
parent: 23fa74b5f9c7eae4d1686ec5fd3d7e79c2a7ebdf
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Sun, 11 Jan 2015 13:26:42 +0100

[fix] dates before 1900

Diffstat:
M
searx/engines/wikidata.py
22
++++++----------------

1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/searx/engines/wikidata.py b/searx/engines/wikidata.py
@@ -1,8 +1,7 @@
 import json
 from requests import get
 from urllib import urlencode
-import locale
-import dateutil.parser
+from searx.utils import format_date_by_locale
 
 result_count = 1
 wikidata_host = 'https://www.wikidata.org'
@@ -38,27 +37,18 @@ def response(resp):
     if language == 'all':
         language = 'en'
 
-    try:
-        locale.setlocale(locale.LC_ALL, str(resp.search_params['language']))
-    except:
-        try:
-            locale.setlocale(locale.LC_ALL, 'en_US')
-        except:
-            pass
-        pass
-
     url = url_detail.format(query=urlencode({'ids': '|'.join(wikidata_ids),
                                             'languages': language + '|en'}))
 
     htmlresponse = get(url)
     jsonresponse = json.loads(htmlresponse.content)
     for wikidata_id in wikidata_ids:
-        results = results + getDetail(jsonresponse, wikidata_id, language)
+        results = results + getDetail(jsonresponse, wikidata_id, language, resp.search_params['language'])
 
     return results
 
 
-def getDetail(jsonresponse, wikidata_id, language):
+def getDetail(jsonresponse, wikidata_id, language, locale):
     results = []
     urls = []
     attributes = []
@@ -176,12 +166,12 @@ def getDetail(jsonresponse, wikidata_id, language):
 
     date_of_birth = get_time(claims, 'P569', None)
     if date_of_birth is not None:
-        date_of_birth = dateutil.parser.parse(date_of_birth[8:]).strftime(locale.nl_langinfo(locale.D_FMT))
+        date_of_birth = format_date_by_locale(date_of_birth[8:], locale)
         attributes.append({'label': 'Date of birth', 'value': date_of_birth})
 
     date_of_death = get_time(claims, 'P570', None)
     if date_of_death is not None:
-        date_of_death = dateutil.parser.parse(date_of_death[8:]).strftime(locale.nl_langinfo(locale.D_FMT))
+        date_of_death = format_date_by_locale(date_of_death[8:], locale)
         attributes.append({'label': 'Date of death', 'value': date_of_death})
 
     if len(attributes) == 0 and len(urls) == 2 and len(description) == 0:
@@ -235,7 +225,7 @@ def get_string(claims, propertyName, defaultValue=None):
     if len(result) == 0:
         return defaultValue
     else:
-        #TODO handle multiple urls
+        # TODO handle multiple urls
         return result[0]