fixup! bpo-1154351: add get_current_dir_name() to os module

python · bradengroom · Oct 26, 2018 · Oct 26, 2018 · Oct 26, 2018 · Oct 26, 2018
commit 4bfb33ce73180cc5da912207ae89a3bcfb819098
diff --git a/Doc/library/os.rst b/Doc/library/os.rst
@@ -1707,8 +1707,6 @@ features:
     function is identical to :func:`getcwd()` on systems that do **not**
     support the ``PWD`` environment variable.
 
-    .. availability:: Unix.
-
     .. versionadded:: 3.8
 
 

diff --git a/Lib/os.py b/Lib/os.py
@@ -666,10 +666,7 @@ def get_current_dir_name():
     except KeyError:
         return cwd
 
-    cwd_stat, pwd_stat = map(stat, [cwd, pwd])
-
-    if (cwd_stat.st_dev == pwd_stat.st_dev and
-            cwd_stat.st_ino == pwd_stat.st_ino):
+    if path.samefile(cwd, pwd):
         return pwd
     return cwd
 

diff --git a/Lib/test/test_os.py b/Lib/test/test_os.py
@@ -1264,14 +1264,14 @@ def test_getcwd(self):
         # os.getcwd() always returns the dereferenced path
         with support.temp_cwd(self.tmp_dir):
             os.chdir(self.tmp_dir)
-            self.assertEqual(self.tmp_dir, os.getcwd())
+            self.assertEqual(os.getcwd(), self.tmp_dir)
             os.symlink(self.tmp_dir, self.tmp_lnk, True)
             os.chdir(self.tmp_lnk)
-            self.assertEqual(self.tmp_dir, os.getcwd())
+            self.assertEqual(os.getcwd(), self.tmp_dir)
             with mock.patch.dict('os.environ', {'PWD': self.tmp_dir}):
-                self.assertEqual(self.tmp_dir, os.getcwd())
+                self.assertEqual(os.getcwd(), self.tmp_dir)
             with mock.patch.dict('os.environ', {'PWD': self.tmp_lnk}):
-                self.assertEqual(self.tmp_dir, os.getcwd())
+                self.assertEqual(os.getcwd(), self.tmp_dir)
             os.unlink(self.tmp_lnk)
 
     def test_get_current_dir_name(self):
@@ -1280,14 +1280,14 @@ def test_get_current_dir_name(self):
         # whether the path contains symlinks.
         with support.temp_cwd(self.tmp_dir):
             with mock.patch.dict('os.environ', {'PWD': self.tmp_dir}):
-                self.assertEqual(self.tmp_dir, os.get_current_dir_name())
+                self.assertEqual(os.get_current_dir_name(), self.tmp_dir)
+            self.addCleanup(support.unlink, self.tmp_lnk)
             os.symlink(self.tmp_dir, self.tmp_lnk, True)
             with mock.patch.dict('os.environ', {'PWD': self.tmp_lnk}):
                 if os.name == 'posix':
-                    self.assertEqual(self.tmp_lnk, os.get_current_dir_name())
+                    self.assertEqual(os.get_current_dir_name(), self.tmp_lnk)
                 else:
-                    self.assertEqual(self.tmp_dir, os.get_current_dir_name())
-            os.unlink(self.tmp_lnk)
+                    self.assertEqual(os.get_current_dir_name(), self.tmp_dir)
 
 
 class RemoveDirsTests(unittest.TestCase):