/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/config.py

  • Committer: Andrew Bennetts
  • Date: 2008-02-18 23:26:27 UTC
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080218232627-v6cuj0596nh3rw56
Fix test suite, mainly weeding out uses of bzrlib.user_encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/config.py
235
235
        """
236
236
        v = os.environ.get('BZR_EMAIL')
237
237
        if v:
238
 
            return v.decode(bzrlib.user_encoding)
 
238
            return v.decode(osutils.get_user_encoding())
239
239
 
240
240
        v = self._get_user_id()
241
241
        if v:
243
243
 
244
244
        v = os.environ.get('EMAIL')
245
245
        if v:
246
 
            return v.decode(bzrlib.user_encoding)
 
246
            return v.decode(osutils.get_user_encoding())
247
247
 
248
248
        name, email = _auto_user_id()
249
249
        if name:
644
644
        try:
645
645
            return (self.branch.control_files.get_utf8("email") 
646
646
                    .read()
647
 
                    .decode(bzrlib.user_encoding)
 
647
                    .decode(osutils.get_user_encoding())
648
648
                    .rstrip("\r\n"))
649
649
        except errors.NoSuchFile, e:
650
650
            pass
832
832
            encoding = 'utf-8'
833
833
        except UnicodeError:
834
834
            try:
835
 
                gecos = w.pw_gecos.decode(bzrlib.user_encoding)
836
 
                encoding = bzrlib.user_encoding
 
835
                encoding = osutils.get_user_encoding()
 
836
                gecos = w.pw_gecos.decode(encoding)
837
837
            except UnicodeError:
838
838
                raise errors.BzrCommandError('Unable to determine your name.  '
839
839
                   'Use "bzr whoami" to set it.')
854
854
    except ImportError:
855
855
        import getpass
856
856
        try:
857
 
            realname = username = getpass.getuser().decode(bzrlib.user_encoding)
 
857
            user_encoding = osutils.get_user_encoding()
 
858
            realname = username = getpass.getuser().decode(user_encoding)
858
859
        except UnicodeDecodeError:
859
860
            raise errors.BzrError("Can't decode username as %s." % \
860
 
                    bzrlib.user_encoding)
 
861
                    user_encoding)
861
862
 
862
863
    return realname, (username + '@' + socket.gethostname())
863
864