summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/pathlib.py9
-rw-r--r--Misc/NEWS2
2 files changed, 6 insertions, 5 deletions
diff --git a/Lib/pathlib.py b/Lib/pathlib.py
index bceae00..1622cbb 100644
--- a/Lib/pathlib.py
+++ b/Lib/pathlib.py
@@ -15,16 +15,15 @@ from urllib.parse import quote_from_bytes as urlquote_from_bytes
supports_symlinks = True
-try:
+if os.name == 'nt':
import nt
-except ImportError:
- nt = None
-else:
if sys.getwindowsversion()[:2] >= (6, 0):
from nt import _getfinalpathname
else:
supports_symlinks = False
_getfinalpathname = None
+else:
+ nt = None
__all__ = [
@@ -110,7 +109,7 @@ class _WindowsFlavour(_Flavour):
has_drv = True
pathmod = ntpath
- is_supported = (nt is not None)
+ is_supported = (os.name == 'nt')
drive_letters = (
set(chr(x) for x in range(ord('a'), ord('z') + 1)) |
diff --git a/Misc/NEWS b/Misc/NEWS
index 3e07239..30df605 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -185,6 +185,8 @@ Core and Builtins
Library
-------
+- Issue #22370: Windows detection in pathlib is now more robust.
+
- Issue #22841: Reject coroutines in asyncio add_signal_handler().
Patch by Ludovic.Gasc.