← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: John Arbash Meinel
  • Date: 2007-04-28 15:04:17 UTC
  • mfrom: (2466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2566.
  • Revision ID: john@arbash-meinel.com-20070428150417-trp3pi0pzd411pu4
[merge] bzr.dev 2466

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
840
840
 
841
841
    def _get_config(self):
842
842
        try:
843
 
            obj = ConfigObj(self.branch.control_files.get('branch.conf'), 
 
843
            obj = ConfigObj(self.branch.control_files.get('branch.conf'),
844
844
                            encoding='utf-8')
845
845
        except errors.NoSuchFile:
846
846
            obj = ConfigObj(encoding='utf=8')