[logging] log_level option is case-sensitive after Trac 1.2

[Jun Omae]

$ ~/venv/trac/1.0.13/trac-admin /dev/shm/tracenv-1.0
Welcome to trac-admin 1.0.13
Interactive Trac administration console.
Copyright (C) 2003-2013 Edgewall Software

Type:  '?' or 'help' for help on commands.

Trac [/dev/shm/tracenv-1.0]> config get logging log_level
info
Trac [/dev/shm/tracenv-1.0]>
$ ~/venv/trac/1.2/trac-admin /dev/shm/tracenv-1.0
Welcome to trac-admin 1.2
Interactive Trac administration console.
Copyright (C) 2003-2013 Edgewall Software

Type:  '?' or 'help' for help on commands.

Trac [/dev/shm/tracenv-1.0]> upgrade
Error: [logging] log_level: expected one of ("ALL", "CRITICAL", "DEBUG", "ERROR", "INFO", "WARN", "WARNING"), got u'info'

[Ryan J Ollos]

Regression from #11573. We could add a case_sensitive argument to ChoiceOption.

trac/config.py

@@ -819 +819 @@
     """
 
     def __init__(self, section, name, choices, doc='', doc_domain='tracini',
-                 doc_args=None):
+                 doc_args=None, case_sensitive=True):
         Option.__init__(self, section, name, to_unicode(choices[0]), doc,
                         doc_domain, doc_args)
         self.choices = set(to_unicode(c).strip() for c in choices)
+        self.case_sensitive = case_sensitive
 
     def accessor(self, section, name, default):
         value = section.get(name, default)
-        if value not in self.choices:
+        choices = self.choices
+        if not self.case_sensitive:
+            value = value.lower()
+            choices = map(unicode.lower, choices)
+        if value not in choices:
             raise ConfigurationError(
                     _('[%(section)s] %(entry)s: expected one of '
                       '(%(choices)s), got %(value)s',

trac/env.py

@@ -250 +250 @@
         """Level of verbosity in log.
 
         Should be one of (`CRITICAL`, `ERROR`, `WARNING`, `INFO`, `DEBUG`).
-        """)
+        """, case_sensitive=False)
 
     log_format = Option('logging', 'log_format', None,
         """Custom logging format.

I would prefer to not make case_sensitive be the last argument in the list, but I suppose that is required for backward-compatibility.