From: Enrico Forestieri <forenr@lyx.org>
Date: Tue, 6 Mar 2012 21:24:04 +0000 (+0000)
Subject: On Windows, properly account for the encoding of the temporary directory.
X-Git-Tag: 2.0.4~189
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=8c24088b797e0bb37f6511b3cc0dbdbbd4908026;p=features.git

On Windows, properly account for the encoding of the temporary directory.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40875 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/lib/configure.py b/lib/configure.py
index f37bfdb47f..767a7a9ab8 100644
--- a/lib/configure.py
+++ b/lib/configure.py
@@ -109,9 +109,13 @@ def checkTeXPaths():
         from tempfile import mkstemp
         fd, tmpfname = mkstemp(suffix='.ltx')
         if os.name == 'nt':
+            from locale import getdefaultlocale
             from ctypes import windll, create_unicode_buffer
             GetShortPathName = windll.kernel32.GetShortPathNameW
-            longname = unicode(tmpfname)
+            language, encoding = getdefaultlocale()
+            if encoding == None:
+                encoding = 'latin1'
+            longname = unicode(tmpfname, encoding)
             shortlen = GetShortPathName(longname, 0, 0)
             shortname = create_unicode_buffer(shortlen)
             if GetShortPathName(longname, shortname, shortlen):
diff --git a/status.20x b/status.20x
index da525fe2d1..370f893f2d 100644
--- a/status.20x
+++ b/status.20x
@@ -62,6 +62,9 @@ What's new
 
 - Fix pasting of LATIN CAPITAL LETTER SHARP S (bug 8057).
 
+- Fix reconfiguration on Windows when the temporary directory used by
+  python contains non-ascii characters.
+
 
 * TEX2LYX