Browse Source

[fix] string formatting

Adam Tauber 10 years ago
parent
commit
35ddbecd74
1 changed files with 9 additions and 8 deletions
  1. 9
    8
      searx/engines/mediawiki.py

+ 9
- 8
searx/engines/mediawiki.py View File

22
 
22
 
23
 # search-url
23
 # search-url
24
 base_url = 'https://{language}.wikipedia.org/'
24
 base_url = 'https://{language}.wikipedia.org/'
25
-search_url = base_url + 'w/api.php?action=query\
26
-                                  &list=search\
27
-                                  &{query}\
28
-                                  &srprop=timestamp\
29
-                                  &format=json\
30
-                                  &sroffset={offset}\
31
-                                  &srlimit={limit}'
25
+search_url = base_url + 'w/api.php?action=query'\
26
+                                 '&list=search'\
27
+                                 '&{query}'\
28
+                                 '&srprop=timestamp'\
29
+                                 '&format=json'\
30
+                                 '&sroffset={offset}'\
31
+                                 '&srlimit={limit}'
32
 
32
 
33
 
33
 
34
 # do search-request
34
 # do search-request
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))
41
 
41
 
42
     if params['language'] == 'all':
42
     if params['language'] == 'all':
43
         language = 'en'
43
         language = 'en'
46
 
46
 
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)
49
 
50
 
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