--- a/mercurial/win32.py Fri Apr 03 13:20:52 2009 -0500
+++ b/mercurial/win32.py Fri Apr 03 14:51:48 2009 -0500
@@ -16,7 +16,7 @@
import errno, os, sys, pywintypes, win32con, win32file, win32process
import cStringIO, winerror
-import osutil
+import osutil, encoding
import util
from win32com.shell import shell,shellcon
@@ -213,7 +213,7 @@
try:
val = QueryValueEx(OpenKey(s, key), valname)[0]
# never let a Unicode string escape into the wild
- return util.tolocal(val.encode('UTF-8'))
+ return encoding.tolocal(val.encode('UTF-8'))
except EnvironmentError:
pass