← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Robert Collins
  • Date: 2006-01-25 01:43:34 UTC
  • mto: (1534.1.15 integration)
  • mto: This revision was merged to the branch mainline in revision 1550.
  • Revision ID: robertc@robertcollins.net-20060125014334-8dd9ed73c26c5956
Implement final review suggestions.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
379
379
        This is looked up in the email controlfile for the branch.
380
380
        """
381
381
        try:
382
 
            return (self.branch.control_files.controlfile("email", "r") 
 
382
            return (self.branch.control_files.get_utf8("email") 
383
383
                    .read()
384
384
                    .decode(bzrlib.user_encoding)
385
385
                    .rstrip("\r\n"))
520
520
 
521
521
    def _get_config(self):
522
522
        try:
523
 
            obj = ConfigObj(self.branch.control_files.controlfile('branch.conf',
524
 
                                                    'rb').readlines())
 
523
            obj = ConfigObj(self.branch.control_files.get('branch.conf'
 
524
                        ).readlines())
525
525
            obj.decode('UTF-8')
526
526
        except errors.NoSuchFile:
527
527
            obj = ConfigObj()