[Python-checkins] r70157 - python/branches/py3k/Python/import.c

[hirokazu.yamamoto]

Author: hirokazu.yamamoto
Date: Wed Mar  4 02:52:10 2009
New Revision: 70157

Log:
Issue #5273: Fixed import failure on unicode path. (especially on windows)

Modified:
   python/branches/py3k/Python/import.c

Modified: python/branches/py3k/Python/import.c
==============================================================================
--- python/branches/py3k/Python/import.c	(original)
+++ python/branches/py3k/Python/import.c	Wed Mar  4 02:52:10 2009
@@ -990,13 +990,15 @@
 {
 	PyObject *oldname, *newname;
 
-	if (!PyUnicode_CompareWithASCIIString(co->co_filename, pathname))
-		return 0;
-
-	newname = PyUnicode_FromString(pathname);
+	newname = PyUnicode_DecodeFSDefault(pathname);
 	if (newname == NULL)
 		return -1;
 
+	if (!PyUnicode_Compare(co->co_filename, newname)) {
+		Py_DECREF(newname);
+		return 0;
+	}
+
 	oldname = co->co_filename;
 	Py_INCREF(oldname);
 	update_code_filenames(co, oldname, newname);