>Should PyUnicode_CompareWithASCIIString() be replaced with something
>else as well?

I hope revised patch will fix this too. There seems to be no function to
compare unicode object and file system encoded string, so I moved
unicode creation before comparation. This might increase overhead a bit.

Issue3080 is big issue, so this is minimal solution for this issue. I
confirmed test_import.py passed.