[Python-checkins] bpo-25172: Raise appropriate ImportError msg when crypt module used on Windows (GH-15149)

[Paul Moore]

https://github.com/python/cpython/commit/f4e725f224b864bf9bf405ff7f863cda46fca1cd
commit: f4e725f224b864bf9bf405ff7f863cda46fca1cd
branch: master
author: shireenrao <shireenrao at gmail.com>
committer: Paul Moore <p.f.moore at gmail.com>
date: 2019-08-08T21:02:49+01:00
summary:

bpo-25172: Raise appropriate ImportError msg when crypt module used on Windows (GH-15149)

files:
A Misc/NEWS.d/next/Windows/2019-08-06-18-09-18.bpo-25172.Akreij.rst
M Lib/crypt.py

diff --git a/Lib/crypt.py b/Lib/crypt.py
index b0e47f430c3c..8846602d7613 100644
--- a/Lib/crypt.py
+++ b/Lib/crypt.py
@@ -1,6 +1,15 @@
 """Wrapper to the POSIX crypt library call and associated functionality."""
 
-import _crypt
+import sys as _sys
+
+try:
+    import _crypt
+except ModuleNotFoundError:
+    if _sys.platform == 'win32':
+        raise ImportError("The crypt module is not supported on Windows")
+    else:
+        raise ImportError("The required _crypt module was not built as part of CPython")
+
 import string as _string
 from random import SystemRandom as _SystemRandom
 from collections import namedtuple as _namedtuple
diff --git a/Misc/NEWS.d/next/Windows/2019-08-06-18-09-18.bpo-25172.Akreij.rst b/Misc/NEWS.d/next/Windows/2019-08-06-18-09-18.bpo-25172.Akreij.rst
new file mode 100644
index 000000000000..47106d887921
--- /dev/null
+++ b/Misc/NEWS.d/next/Windows/2019-08-06-18-09-18.bpo-25172.Akreij.rst
@@ -0,0 +1 @@
+Trying to import the :mod:`crypt` module on Windows will result in an :exc:`ImportError` with a message explaining that the module isn't supported on Windows. On other platforms, if the underlying ``_crypt`` module is not available, the ImportError will include a message explaining the problem.