combined patches from http://bugs.python.org/issue3187

Lib/test/test_unicode_file.py

 # Test some Unicode file name semantics
 # We dont test many operations on files other than
 # that their names can be used with Unicode characters.
 import os, glob, time, shutil
 import unicodedata
 
 import unittest
 from test.support import run_unittest, TestSkipped, TESTFN_UNICODE
 from test.support import TESTFN_ENCODING, TESTFN_UNICODE_UNENCODEABLE
 try:
@@ skipping 72 matching lines @@
         self.failUnless(os.path.exists(filename1))
         # Note - due to the implementation of shutil.move,
         # it tries a rename first.  This only fails on Windows when on
         # different file systems - and this test can't ensure that.
         # So we test the shutil.copy2 function, which is the thing most
         # likely to fail.
         shutil.copy2(filename1, filename2 + ".new")
         os.unlink(filename1 + ".new")
 
     def _do_directory(self, make_name, chdir_name, encoded):
-        cwd = os.getcwd()
+        cwd = os.getcwdb()
         if os.path.isdir(make_name):
             os.rmdir(make_name)
         os.mkdir(make_name)
         try:
             os.chdir(chdir_name)
             try:
                 if not encoded:
-                    cwd_result = os.getcwdu()
+                    cwd_result = os.getcwd()
                     name_result = make_name
                 else:
-                    cwd_result = os.getcwd().decode(TESTFN_ENCODING)
+                    cwd_result = os.getcwdb().decode(TESTFN_ENCODING)
                     name_result = make_name.decode(TESTFN_ENCODING)
 
                 cwd_result = unicodedata.normalize("NFD", cwd_result)
                 name_result = unicodedata.normalize("NFD", name_result)
 
                 self.failUnlessEqual(os.path.basename(cwd_result),name_result)
             finally:
                 os.chdir(cwd)
         finally:
             os.rmdir(make_name)
@@ skipping 44 matching lines @@
         if TESTFN_UNICODE_UNENCODEABLE is not None:
             self._do_directory(TESTFN_UNICODE_UNENCODEABLE+ext,
                                TESTFN_UNICODE_UNENCODEABLE+ext,
                                False)
 
 def test_main():
     run_unittest(__name__)
 
 if __name__ == "__main__":
     test_main()