Merge lp:~maaarc-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount-deactivatedaccount/ubuntu/natty/checkbox/checkbox-fix-0.10.4 into lp:ubuntu/natty/checkbox

[Barry Warsaw]

Your change applying Marc's upstream patch improves the fix.

[Barry Warsaw (barry)]

review: Approve

[Micah Gersten (micahg)]

Shouldn't the version on this be 0.10.4-0ubuntu1 since there's an upstream release tarball?

[Barry Warsaw (barry)]

Where's the upstream tarball? It's not at:

https://launchpad.net/checkbox

AFAICT.

[Micah Gersten (micahg)]

There's a watch file pointing to it.

=== modified file 'checkbox/lib/config.py'
--- checkbox/lib/config.py	2010-12-15 13:05:20 +0000
+++ checkbox/lib/config.py	2011-01-06 19:57:07 +0000
@@ -20,7 +20,6 @@
 import re
 import logging
 import posixpath
-import types
 
 from ConfigParser import ConfigParser
 
@@ -38,7 +37,7 @@
 
     def __setitem__(self, key, value):
         if key == "includes":
-            if type(value) == types.ListType:
+            if isinstance(value, list):
                 value = value[0]
             for path in split(value):
                 path = self._parser._interpolate("DEFAULT", None, path, self)

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-15 13:05:20 +0000
+++ debian/changelog	2011-01-06 19:57:07 +0000
@@ -1,3 +1,9 @@
+checkbox (0.10.4) natty; urgency=low
+
+  * Added Marc Tardif's Fixed parsing of config parameters (LP: #689140)
+
+ -- Marc Legris <[e-mail]>  Thu, 06 Jan 2011 09:51:37 -0500
+
 checkbox (0.10.3ubuntu1) natty; urgency=low
 
   * Hack to work around internals of ConfigParser in python2.7. LP: #689140.