@@ -22,13 +22,13 @@ number_of_results = 1
23# search-url
23# search-url
24base_url = 'https://{language}.wikipedia.org/'
24base_url = 'https://{language}.wikipedia.org/'
25−search_url = base_url + 'w/api.php?action=query\
25+search_url = base_url + 'w/api.php?action=query'\
26− &list=search\
26+ '&list=search'\
27− &{query}\
27+ '&{query}'\
28− &srprop=timestamp\
28+ '&srprop=timestamp'\
29− &format=json\
29+ '&format=json'\
30− &sroffset={offset}\
30+ '&sroffset={offset}'\
31− &srlimit={limit}'
31+ '&srlimit={limit}'
34# do search-request
34# do search-request
@@ -37,7 +37,7 @@ def request(query, params):
37 string_args = dict(query=urlencode({'srsearch': query}),
37 string_args = dict(query=urlencode({'srsearch': query}),
38 offset=offset,
38 offset=offset,
39 limit=number_of_results)
39 limit=number_of_results)
40− format_strings = Formatter().parse(base_url)
40+ format_strings = list(Formatter().parse(base_url))
42 if params['language'] == 'all':
42 if params['language'] == 'all':
43 language = 'en'
43 language = 'en'
@@ -46,6 +46,7 @@ def request(query, params):
47 if len(format_strings) > 1:
47 if len(format_strings) > 1:
48 string_args['language'] = language
48 string_args['language'] = language
49+ print search_url.format(**string_args)
50 # write search-language back to params, required in response
51 # write search-language back to params, required in response
51 params['language'] = language
52 params['language'] = language