Issue 1374 - Don`t hardcode web handlers for multiplexer

sitescripts/utils.py

 # coding: utf-8
 
 # This file is part of the Adblock Plus web scripts,
 # Copyright (C) 2006-2014 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 55 matching lines @@
   paths.append(os.path.expanduser('~/sitescripts.ini'))
 
   # Server-wide configuration if no custom found
   paths.append('/etc/sitescripts')
   paths.append('/etc/sitescripts.ini')
 
   for path in paths:
     path = os.path.abspath(path)
     if os.path.exists(path):
       config = SafeConfigParser()
+      config.optionxform = str

[Sebastian Noack, 2014/09/18 16:05:37]

Why is this necessary? Won't that break for options with non-ASCII charterers?

[Wladimir Palant, 2014/09/18 18:04:14]

By default, SafeConfigParser will lower-case all option names in order to treat
them case-insensitively - this will mangle module names. Using str for
optionxform is actually the recommendation in the ConfigParser documentation to
disable this behavior. And - yes, this only works as long as all option names
use ASCII. However, the config.read() call below reads the file as ASCII so if
we want to allow Unicode we need to fix that as well.

[Sebastian Noack, 2014/09/18 19:01:07]

How about a simple no-op?

config.optionxform = lambda x: x

[Wladimir Palant, 2014/09/18 19:12:22]

Sounds like a good compromise. This will allow using bogus option names like
calling .set_option("foo", {}, "True") but we don't really care here.

       config.read(path)
       return config
 
   raise Exception('No config file found. Please put sitescripts.ini into your home directory or /etc')
 
 def setupStderr(stream=sys.stderr):
   """
     Sets up sys.stderr to accept Unicode characters, redirects error output to
     the stream passed in if any.
   """
@@ skipping 62 matching lines @@
     Returns a custom Jinja2 template environment with additional filters.
   """
   from sitescripts.templateFilters import filters
   import jinja2
   if not loader:
     loader = jinja2.FileSystemLoader(siteScriptsPath)
   env = jinja2.Environment(loader=loader, autoescape=True)
   env.filters.update(filters)
   env.filters.update(additional_filters)
   return env