[Pkg-bazaar-maint] Local change in bzr packaging branch that I do not understand

[Max Bowsher]

On 15/10/10 12:34, Jelmer Vernooij wrote:
> Hi Max,
> 
> On Fri, 2010-10-15 at 12:17 +0100, Max Bowsher wrote:
>> We have the following diff in our packaging branch, vs. Bazaar upstream:
>>
>> === modified file bzrlib/rules.py
>> --- bzrlib/rules.py	2009-05-07 05:08:46 +0000
>> +++ bzrlib/rules.py	2010-02-05 12:54:32 +0000
>> @@ -75,7 +75,7 @@
>>          :param inifile: the name of the file or a sequence of lines.
>>          """
>>          options = {'encoding': 'utf-8'}
>> -        self._cfg = configobj.ConfigObj(inifile, options=options)
>> +        self._cfg = configobj.ConfigObj(inifile, **options)
>>          sections = self._cfg.keys()
>>          patterns = []
>>          self.pattern_to_section = {}

> The version of ConfigObj that we have (had?) in Debian didn't accept the
> options argument.

Hmm. OK - but even the version in etch seems to do so.

However, on looking into this more, it appears that this is the only
place in bzrlib that uses the ConfigObj constructor in this way, so I
shall take the approach of merge-proposing to bzr.dev that it be fixed
to use the same style as elsewhere in bzrlib, which is roughly
equivalent to what the change in the packaging branch already does.

Max.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/pkg-bazaar-maint/attachments/20101017/9a77a21e/attachment.pgp>