# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1282236690 18000
# Node ID 5ebf8afbdc5c1066a35c90d484fef3a52f22bf2b
# Parent  f853873fc66d536b86e3afc7e2feea9b86c4fd25# Parent  3145951e50fe550f3ce6611824517fa8d1079f8a
merge with stable

diff -r f853873fc66d -r 5ebf8afbdc5c hgext/convert/cvs.py
--- a/hgext/convert/cvs.py	Wed Aug 18 18:56:44 2010 -0400
+++ b/hgext/convert/cvs.py	Thu Aug 19 11:51:30 2010 -0500
@@ -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()
 
diff -r f853873fc66d -r 5ebf8afbdc5c hgext/convert/gnuarch.py
--- a/hgext/convert/gnuarch.py	Wed Aug 18 18:56:44 2010 -0400
+++ b/hgext/convert/gnuarch.py	Thu Aug 19 11:51:30 2010 -0500
@@ -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.locale = locale.getpreferredencoding()
+        self.encoding = encoding.encoding
         self.archives = []
 
     def before(self):