← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/config.py

Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
643
643
        This is looked up in the email controlfile for the branch.
644
644
        """
645
645
        try:
646
 
            return (self.branch.control_files.get_utf8("email") 
647
 
                    .read()
 
646
            return (self.branch.control_files._transport.get_bytes("email")
648
647
                    .decode(bzrlib.user_encoding)
649
648
                    .rstrip("\r\n"))
650
649
        except errors.NoSuchFile, e: