Skip to content

bpo-1154351: Add get_current_dir_name() to os module #10117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bradengroom wants to merge 9 commits into from
Closed

bpo-1154351: Add get_current_dir_name() to os module #10117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1daae93
bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
ee4c4f6
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
f836691
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
89e1984
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 26, 2018
4bfb33c
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
963659a
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
cc1735f
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
d49fdf3
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
17386e1
fixup! bpo-1154351: add get_current_dir_name() to os module
bradengroom Oct 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup! bpo-1154351: add get_current_dir_name() to os module
  • Loading branch information
@bradengroom
bradengroom committed Oct 27, 2018
commit 4bfb33ce73180cc5da912207ae89a3bcfb819098
2 changes: 0 additions & 2 deletions Doc/library/os.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
5 changes: 1 addition & 4 deletions Lib/os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
16 changes: 8 additions & 8 deletions Lib/test/test_os.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Copy link
Copy Markdown
Member

@serhiy-storchaka serhiy-storchaka Oct 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The link will be leaked in the case of failure. It is better to use addCleanup(). Add the following line just before creating a link.

self.addCleanup(support.unlink, self.tmp_lnk)


def test_get_current_dir_name(self):
Expand All @@ -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):
Expand Down