@@ -10,7 +10,7 @@ if sys.version_info[0] == 3:
10 unicode = str
10 unicode = str
12categories = []
12categories = []
13−url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X'
13+url = 'https://finance.google.com/finance/converter?a=1&from={0}&to={1}'
14weight = 100
14weight = 100
16parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
16parser_re = re.compile(b'.*?(\\d+(?:\\.\\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I)
@@ -51,7 +51,7 @@ def request(query, params):
52 q = (from_currency + to_currency).upper()
52 q = (from_currency + to_currency).upper()
54− params['url'] = url.format(query=q)
54+ params['url'] = url.format(from_currency, to_currency)
55 params['ammount'] = ammount
55 params['ammount'] = ammount
56 params['from'] = from_currency
56 params['from'] = from_currency
57 params['to'] = to_currency
57 params['to'] = to_currency
@@ -63,8 +63,11 @@ def request(query, params):
64def response(resp):
64def response(resp):
65 results = []
65 results = []
66+ pat = '<span class=bld>(.+) {0}</span>'.format(
67+ resp.search_params['to'].upper())
67− _, conversion_rate, _ = resp.text.split(',', 2)
70+ conversion_rate = re.findall(pat, resp.text)[0]
68 conversion_rate = float(conversion_rate)
71 conversion_rate = float(conversion_rate)
70 return results
73 return results
@@ -79,14 +82,8 @@ def response(resp):
79 resp.search_params['to_name'],
82 resp.search_params['to_name'],
82− now_date = datetime.now().strftime('%Y%m%d')
85+ url = 'https://finance.google.com/finance?q={0}{1}'.format(
83− url = 'https://finance.yahoo.com/currency/converter-results/{0}/{1}-{2}-to-{3}.html' # noqa
86− resp.search_params['ammount'],
87− resp.search_params['from'].lower(),
86+ resp.search_params['from'].upper(), resp.search_params['to'])
88− resp.search_params['to'].lower()
91 results.append({'answer': answer, 'url': url})
88 results.append({'answer': answer, 'url': url})