| OLD | NEW | 
|---|
| 1 # This file is part of Adblock Plus | 1 # This file is part of Adblock Plus | 
| 2 # Copyright (C) 2006-2015 Eyeo GmbH | 2 # Copyright (C) 2006-2015 Eyeo GmbH | 
| 3 # | 3 # | 
| 4 # Adblock Plus is free software: you can redistribute it and/or modify | 4 # Adblock Plus is free software: you can redistribute it and/or modify | 
| 5 # it under the terms of the GNU General Public License version 3 as | 5 # it under the terms of the GNU General Public License version 3 as | 
| 6 # published by the Free Software Foundation. | 6 # published by the Free Software Foundation. | 
| 7 # | 7 # | 
| 8 # Adblock Plus is distributed in the hope that it will be useful, | 8 # Adblock Plus is distributed in the hope that it will be useful, | 
| 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 9 # but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 10 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | 
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 199 | 199 | 
| 200     # Make sure we still have search engines left | 200     # Make sure we still have search engines left | 
| 201     if len(engine_ids) == 0: | 201     if len(engine_ids) == 0: | 
| 202         logger.fatal("No search engines left over for '%s'" % locale) | 202         logger.fatal("No search engines left over for '%s'" % locale) | 
| 203 | 203 | 
| 204     # 'Parse' XML to get matching 'ShortName' for all engine IDs | 204     # 'Parse' XML to get matching 'ShortName' for all engine IDs | 
| 205     engine_names = {} | 205     engine_names = {} | 
| 206     for eid in engine_ids[:]: | 206     for eid in engine_ids[:]: | 
| 207         xml_file_path = os.path.join(path, _SEARCHPLUGINS_PATH, "%s.xml" % eid) | 207         xml_file_path = os.path.join(path, _SEARCHPLUGINS_PATH, "%s.xml" % eid) | 
| 208         if not os.path.exists(xml_file_path): | 208         if not os.path.exists(xml_file_path): | 
| 209             logger.info("Missing xml file for plugin %s. Searched in path %s" | 209             logger.info("Missing xml file for plugin %s. Searched in path %s" % | 
| 210                         % eid, xml_file_path) | 210                         (eid, xml_file_path)) | 
| 211             engine_ids.remove(eid) | 211             engine_ids.remove(eid) | 
| 212             continue | 212             continue | 
| 213         short_name = None | 213         short_name = None | 
| 214         with open(xml_file_path, "r") as fd: | 214         with open(xml_file_path, "r") as fd: | 
| 215             for line in fd: | 215             for line in fd: | 
| 216                 line = line.strip() | 216                 line = line.strip() | 
| 217                 match = _SHORTNAME_RE.match(line) | 217                 match = _SHORTNAME_RE.match(line) | 
| 218                 if match: | 218                 if match: | 
| 219                     short_name = match.group(1).strip() | 219                     short_name = match.group(1).strip() | 
| 220 | 220 | 
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 364         if os.path.exists(locale_path): | 364         if os.path.exists(locale_path): | 
| 365             _transform_locale(locale, locale_path, logger) | 365             _transform_locale(locale, locale_path, logger) | 
| 366             _generate_browser_search(locale, locale_path, res_path, build_dir) | 366             _generate_browser_search(locale, locale_path, res_path, build_dir) | 
| 367         else: | 367         else: | 
| 368             logger.error("Missing folder for locale '%s' in path: %s" % | 368             logger.error("Missing folder for locale '%s' in path: %s" % | 
| 369                          (locale, locale_path)) | 369                          (locale, locale_path)) | 
| 370 | 370 | 
| 371     for locale in values_locales: | 371     for locale in values_locales: | 
| 372         locale_path = os.path.join(res_path, "values-" + locale) | 372         locale_path = os.path.join(res_path, "values-" + locale) | 
| 373         _transform_values_locale(locale, locale_path, logger) | 373         _transform_values_locale(locale, locale_path, logger) | 
| OLD | NEW | 
|---|