Merge branch 'main' into gh-125413-info

Lib/pathlib/_abc.py

@@ -15,7 +15,7 @@
 import posixpath
 from errno import EINVAL
 from glob import _PathGlobber, _no_recurse_symlinks
-from stat import S_ISDIR, S_ISLNK, S_ISREG, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO
+from stat import S_ISDIR, S_ISLNK, S_ISREG
 from pathlib._os import copyfileobj
 
 

Lib/pathlib/_local.py

@@ -7,7 +7,7 @@
 from errno import EINVAL, EXDEV
 from glob import _StringGlobber
 from itertools import chain
-from stat import S_ISDIR, S_ISREG, S_ISLNK
+from stat import S_ISDIR, S_ISREG, S_ISLNK, S_ISSOCK, S_ISBLK, S_ISCHR, S_ISFIFO
 from _collections_abc import Sequence
 
 try: