Mercurial > hg-stable
changeset 11987:3145951e50fe stable
convert: use encoding.encoding instead of locale.getpreferredencoding()
The latter may not return useful results in certain OS X environments.
| author | Brodie Rao <brodie@bitheap.org> |
|---|---|
| date | Wed, 18 Aug 2010 10:53:52 -0400 |
| parents | d2796a3cb816 |
| children | 5ebf8afbdc5c 50523b4407f6 |
| files | hgext/convert/cvs.py hgext/convert/gnuarch.py |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/convert/cvs.py Wed Aug 18 10:53:50 2010 -0400 +++ b/hgext/convert/cvs.py Wed Aug 18 10:53:52 2010 -0400 @@ -5,9 +5,9 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -import os, locale, re, socket, errno +import os, re, socket, errno from cStringIO import StringIO -from mercurial import util +from mercurial import encoding, util from mercurial.i18n import _ from common import NoRepo, commit, converter_source, checktool @@ -30,7 +30,7 @@ self.socket = None self.cvsroot = open(os.path.join(cvs, "Root")).read()[:-1] self.cvsrepo = open(os.path.join(cvs, "Repository")).read()[:-1] - self.encoding = locale.getpreferredencoding() + self.encoding = encoding.encoding self._connect()
--- a/hgext/convert/gnuarch.py Wed Aug 18 10:53:50 2010 -0400 +++ b/hgext/convert/gnuarch.py Wed Aug 18 10:53:52 2010 -0400 @@ -8,8 +8,8 @@ from common import NoRepo, commandline, commit, converter_source from mercurial.i18n import _ -from mercurial import util -import os, shutil, tempfile, stat, locale +from mercurial import encoding, util +import os, shutil, tempfile, stat from email.Parser import Parser class gnuarch_source(converter_source, commandline): @@ -55,7 +55,7 @@ self.parents = {} self.tags = {} self.catlogparser = Parser() - self.encoding = locale.getpreferredencoding() + self.encoding = encoding.encoding self.archives = [] def before(self):