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

Doc/library/os.rst

@@ -1702,10 +1702,10 @@ features:
 .. function:: get_current_dir_name()
 
  Return a string representing the current working directory taking into
- consideration the users ``PWD`` environment variable if it exists. This is
- opposed to :func:`getcwd()` which dereferences symlinks in the path. This
- function is identical to :func:`getcwd()` on systems that do **not**
- support the ``PWD`` environment variable.
+ consideration the users :envvar:`PWD` environment variable if it exists. This is
+ opposed to :func:`getcwd` which dereferences symlinks in the path. This
+ function is identical to :func:`getcwd` on systems that do **not**
+ support the :envvar:`PWD` environment variable.
 
  .. versionadded:: 3.8
 

Doc/whatsnew/3.8.rst

@@ -141,6 +141,12 @@ by right-clicking the button. (Contributed by Tal Einat in :issue:`1529353`.)
 The changes above have been backported to 3.7 maintenance releases.
 
 
+os
+--
+
+Added :func:`~os.get_current_dir_name` function.
+(Contributed by Braden Groom in :issue:`1154351`.)
+
 os.path
 -------
 

Lib/os.py

@@ -660,15 +660,12 @@ def get_current_dir_name():
  the *PWD* environment variable.
  """
  cwd = getcwd()
-
  if name == 'nt':
  return cwd
-
  try:
  pwd = environ["PWD"]
  except KeyError:
  return cwd
-
  if path.samefile(cwd, pwd):
  return pwd
  return cwd

Misc/NEWS.d/next/Library/2018-10-25-19-44-42.bpo-1154351.KhXLos.rst

@@ -1 +1,2 @@
 Add get_current_dir_name() to the os module.
+Patch by Braden Groom