[Python-checkins] cpython (2.7): Issue #29082: Fixed loading libraries in ctypes by unicode names on Windows.

[serhiy.storchaka]

https://hg.python.org/cpython/rev/4ce22d69e134
changeset:   106105:4ce22d69e134
branch:      2.7
parent:      106100:3a01ade11123
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Thu Jan 12 17:00:32 2017 +0200
summary:
  Issue #29082: Fixed loading libraries in ctypes by unicode names on Windows.
Original patch by Chi Hsuan Yen.

files:
  Lib/ctypes/test/test_loading.py |  7 +++++++
  Misc/NEWS                       |  3 +++
  Modules/_ctypes/callproc.c      |  2 +-
  3 files changed, 11 insertions(+), 1 deletions(-)


diff --git a/Lib/ctypes/test/test_loading.py b/Lib/ctypes/test/test_loading.py
--- a/Lib/ctypes/test/test_loading.py
+++ b/Lib/ctypes/test/test_loading.py
@@ -3,6 +3,7 @@
 import os
 from ctypes.util import find_library
 from ctypes.test import is_resource_enabled
+import test.test_support as support
 
 libc_name = None
 if os.name == "nt":
@@ -27,6 +28,12 @@
         CDLL(os.path.basename(libc_name))
         self.assertRaises(OSError, CDLL, self.unknowndll)
 
+    @support.requires_unicode
+    @unittest.skipUnless(libc_name is not None, 'could not find libc')
+    def test_load_unicode(self):
+        CDLL(unicode(libc_name))
+        self.assertRaises(OSError, CDLL, unicode(self.unknowndll))
+
     @unittest.skipUnless(libc_name is not None, 'could not find libc')
     @unittest.skipUnless(libc_name is not None and
                          os.path.basename(libc_name) == "libc.so.6",
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -23,6 +23,9 @@
 Library
 -------
 
+- Issue #29082: Fixed loading libraries in ctypes by unicode names on Windows.
+  Original patch by Chi Hsuan Yen.
+
 - Issue #29006: Revert change from issue #10513 for making sqlite more liable to
   emit "database table is locked" errors.
 
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c
--- a/Modules/_ctypes/callproc.c
+++ b/Modules/_ctypes/callproc.c
@@ -1281,7 +1281,7 @@
     PyObject *nameobj;
     PyObject *ignored;
     HMODULE hMod;
-    if (!PyArg_ParseTuple(args, "S|O:LoadLibrary", &nameobj, &ignored))
+    if (!PyArg_ParseTuple(args, "O|O:LoadLibrary", &nameobj, &ignored))
         return NULL;
 #ifdef _UNICODE
     name = alloca((PyString_Size(nameobj) + 1) * sizeof(WCHAR));

-- 
Repository URL: https://hg.python.org/cpython