← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Martin Pool
  • Date: 2006-03-10 06:29:53 UTC
  • mfrom: (1608 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1611.
  • Revision ID: mbp@sourcefrog.net-20060310062953-bc1c7ade75c89a7a
[merge] bzr.dev; pycurl not updated for readv yet

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
217
217
        else:
218
218
            input = file
219
219
        try:
220
 
            self._parser = ConfigObj(input)
 
220
            self._parser = ConfigObj(input, encoding='utf-8')
221
221
        except configobj.ConfigObjError, e:
222
222
            raise errors.ParseConfigError(e.errors, e.config.filename)
223
223
        return self._parser
334
334
            # if path is longer, and recurse is not true, no match
335
335
            if len(section_names) < len(location_names):
336
336
                try:
337
 
                    if not self._get_parser().get_bool(section, 'recurse'):
 
337
                    if not self._get_parser()[section].as_bool('recurse'):
338
338
                        continue
339
339
                except KeyError:
340
340
                    pass