Noissue - [CMS] Avoid overzealous catching of KeyError during conversion

cms/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2015 Eyeo GmbH
 #
 # Adblock Plus is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 3 as
 # published by the Free Software Foundation.
 #
 # Adblock Plus is distributed in the hope that it will be useful,
@@ skipping 30 matching lines @@
   if params["config"].has_option("locale_overrides", page):
     localefile = params["config"].get("locale_overrides", page)
   params["localedata"] = source.read_locale(params["locale"], localefile)
 
   if params["config"].has_option("general", "siteurl"):
     if site_url_override:
       params["site_url"] = site_url_override
     else:
       params["site_url"] = params["config"].get("general", "siteurl")
 
-  if format in converters:
-    converter = converters[format](params)
-  else:
+  try:
+    converter_class = converters[format]
+  except KeyError:
     raise Exception("Page %s uses unknown format %s" % (page, format))

[Wladimir Palant, 2015/09/21 10:54:29]

I think Sebastian will object to that approach :)

I guess the proper approach would be moving the call outside the try..catch
block.

[kzar, 2015/09/21 11:06:22]

Yea, I guessed it might have been unpopular. It seemed easier that way but
nevermind. Done.

+
+  converter = converter_class(params)
 
   # Note: The converter might change some parameters so we can only read in
   # template data here.
   params["templatedata"] = source.read_template(params["template"])
 
   defaultlocale = params["config"].get("general", "defaultlocale")
   params["defaultlocale"] = defaultlocale
 
   locales = [
     l
@@ skipping 14 matching lines @@
 
   return params
 
 def process_page(source, locale, page, format=None, site_url_override=None,
                  localized_string_callback=None):
   return TemplateConverter(
     get_page_params(source, locale, page, format,
                     site_url_override, localized_string_callback),
     key="templatedata"
   )()