# HG changeset patch # User Henrik Stuart <henrik.stu...@edlund.dk> # Date 1246472971 -7200 # Node ID 7d4a4a139d39a03b88342a7736310e7ad1d0aa79 # Parent 2838824579ffe4eceb748804126aafb66f91e630 contrib/win32: encode unicode paths for use with environment variables
os.environ expects str instances and will try to convert the unicode strings to native strings, causing paths with non-ascii characters to crash any hgtk operation. diff -r 2838824579ff -r 7d4a4a139d39 contrib/win32/config.py --- a/contrib/win32/config.py Tue Jun 30 00:16:18 2009 -0500 +++ b/contrib/win32/config.py Wed Jul 01 20:29:31 2009 +0200 @@ -12,6 +12,7 @@ # current executable to find our package data. import os +import sys import win32api, win32process proc = win32api.GetCurrentProcess() @@ -25,3 +26,10 @@ license_path = os.path.join(bin_path, 'COPYING.txt') locale_path = os.path.join(bin_path, 'locale') icon_path = os.path.join(bin_path, 'icons') + +enc = sys.getfilesystemencoding() +if enc: + bin_path = bin_path.encode(enc) + license_path = license_path.encode(enc) + locale_path = locale_path.encode(enc) + icon_path = icon_path.encode(enc) ------------------------------------------------------------------------------ _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
