diff --git a/Doc/library/os.rst b/Doc/library/os.rst
@@ -1858,6 +1858,12 @@ features:
   .. versionchanged:: 3.6
      Accepts a :term:`path-like object` for *src* and *dst*.


.. function:: mkdir(path, mode=0o777, *, dir_fd=None)

@@ -2039,6 +2045,10 @@ features:
   This function can also support :ref:`paths relative to directory descriptors
   <dir_fd>`.

   .. availability:: Unix, Windows.

   .. versionchanged:: 3.2
@@ -2053,6 +2063,11 @@ features:
   .. versionchanged:: 3.8
      Accepts a :term:`path-like object` and a bytes object on Windows.

.. function:: remove(path, *, dir_fd=None)

   Remove (delete) the file *path*.  If *path* is a directory, an
@@ -2366,7 +2381,8 @@ features:

      On Unix, this method always requires a system call. On Windows, it
      only requires a system call if *follow_symlinks* is ``True`` and the
-      entry is a symbolic link.

      On Windows, the ``st_ino``, ``st_dev`` and ``st_nlink`` attributes of the
      :class:`stat_result` are always set to zero. Call :func:`os.stat` to
@@ -2403,6 +2419,17 @@ features:
   This function can support :ref:`specifying a file descriptor <path_fd>` and
   :ref:`not following symlinks <follow_symlinks>`.

   .. index:: module: stat

   Example::
@@ -2427,6 +2454,14 @@ features:
   .. versionchanged:: 3.6
      Accepts a :term:`path-like object`.


.. class:: stat_result

@@ -2578,7 +2613,7 @@ features:

      File type.

-   On Windows systems, the following attribute is also available:

   .. attribute:: st_file_attributes

@@ -2587,6 +2622,12 @@ features:
      :c:func:`GetFileInformationByHandle`. See the ``FILE_ATTRIBUTE_*``
      constants in the :mod:`stat` module.

   The standard module :mod:`stat` defines functions and constants that are
   useful for extracting information from a :c:type:`stat` structure. (On
   Windows, some items are filled with dummy values.)
@@ -2614,6 +2655,14 @@ features:
   .. versionadded:: 3.7
      Added the :attr:`st_fstype` member to Solaris/derivatives.

.. function:: statvfs(path)

   Perform a :c:func:`statvfs` system call on the given path.  The return value is

diff --git a/Doc/library/shutil.rst b/Doc/library/shutil.rst
@@ -304,6 +304,10 @@ Directory and files operations
      Added a symlink attack resistant version that is used automatically
      if platform supports fd-based functions.

   .. attribute:: rmtree.avoids_symlink_attacks

      Indicates whether the current platform and implementation provides a

diff --git a/Doc/library/stat.rst b/Doc/library/stat.rst
@@ -425,3 +425,13 @@ for more detail on the meaning of these constants.
          FILE_ATTRIBUTE_VIRTUAL

   .. versionadded:: 3.5
diff --git a/Doc/whatsnew/3.8.rst b/Doc/whatsnew/3.8.rst
@@ -808,6 +808,21 @@ A new :func:`os.memfd_create` function was added to wrap the
``memfd_create()`` syscall.
(Contributed by Zackery Spytz and Christian Heimes in :issue:`26836`.)


os.path
-------
@@ -824,6 +839,9 @@ characters or bytes unrepresentable at the OS level.
environment variable and does not use :envvar:`HOME`, which is not normally set
for regular user accounts.

:func:`~os.path.realpath` on Windows now resolves reparse points, including
symlinks and directory junctions.

@@ -912,6 +930,9 @@ format for new archives to improve portability and standards conformance,
inherited from the corresponding change to the :mod:`tarfile` module.
(Contributed by C.A.M. Gerlach in :issue:`30661`.)


ssl
---

diff --git a/Include/fileutils.h b/Include/fileutils.h
@@ -84,6 +84,7 @@ struct _Py_stat_struct {
    time_t st_ctime;
    int st_ctime_nsec;
    unsigned long st_file_attributes;
};
#else
#  define _Py_stat_struct stat

diff --git a/Lib/shutil.py b/Lib/shutil.py
@@ -452,7 +452,14 @@ def _copytree(entries, src, dst, symlinks, ignore, copy_function,
        dstname = os.path.join(dst, srcentry.name)
        srcobj = srcentry if use_srcentry else srcname
        try:
-            if srcentry.is_symlink():
                linkto = os.readlink(srcname)
                if symlinks:
                    # We can't just leave it to `copy_function` because legacy
@@ -537,6 +544,37 @@ def copytree(src, dst, symlinks=False, ignore=None, copy_function=copy2,
                         ignore_dangling_symlinks=ignore_dangling_symlinks,
                         dirs_exist_ok=dirs_exist_ok)

# version vulnerable to race conditions
def _rmtree_unsafe(path, onerror):
    try:
@@ -547,11 +585,7 @@ def _rmtree_unsafe(path, onerror):
        entries = []
    for entry in entries:
        fullname = entry.path
-        try:
-            is_dir = entry.is_dir(follow_symlinks=False)
-        except OSError:
-            is_dir = False
-        if is_dir:
            try:
                if entry.is_symlink():
                    # This can only happen if someone replaces
@@ -681,7 +715,7 @@ def onerror(*args):
            os.close(fd)
    else:
        try:
-            if os.path.islink(path):
                # symlinks to directories are forbidden, see bug #1669
                raise OSError("Cannot call rmtree on a symbolic link")
        except OSError:
Original file line number	Diff line number	Diff line change
Expand Up		@@ -425,3 +425,13 @@ for more detail on the meaning of these constants.
		FILE_ATTRIBUTE_VIRTUAL

		.. versionadded:: 3.5