From 8d0b5313c385ae7adfb56631d9082d4b57db1836 Mon Sep 17 00:00:00 2001
From: Andrew Featherstone <andrew.featherstone@gmail.com>
Date: Sat, 2 Dec 2017 01:29:53 +0000
Subject: Remove testing for hashlib and corresponding support for command line
 options.

hashlib is part of the standard library since Python 2.5, and SCons supports Python 2.7 and later.
---
 doc/man/scons.xml            | 9 ---------
 src/engine/SCons/CacheDir.py | 7 +------
 src/engine/SCons/Warnings.py | 3 ---
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/doc/man/scons.xml b/doc/man/scons.xml
index bc3793f..fe1803b 100644
--- a/doc/man/scons.xml
+++ b/doc/man/scons.xml
@@ -1871,15 +1871,6 @@ These warnings are enabled by default.</para>
   </listitem>
   </varlistentry>
   <varlistentry>
-  <term>--warn=no-md5-module, --warn=no-no-md5-module</term>
-  <listitem>
-<para>Enables or disables warnings about the version of Python
-not having an MD5 checksum module available.
-These warnings are enabled by default.</para>
-
-  </listitem>
-  </varlistentry>
-  <varlistentry>
   <term>--warn=no-metaclass-support, --warn=no-no-metaclass-support</term>
   <listitem>
 <para>Enables or disables warnings about the version of Python
diff --git a/src/engine/SCons/CacheDir.py b/src/engine/SCons/CacheDir.py
index 1690674..ac91c85 100644
--- a/src/engine/SCons/CacheDir.py
+++ b/src/engine/SCons/CacheDir.py
@@ -27,6 +27,7 @@ __doc__ = """
 CacheDir support
 """
 
+import hashlib
 import json
 import os
 import stat
@@ -134,12 +135,6 @@ warned = dict()
 class CacheDir(object):
 
     def __init__(self, path):
-        try:
-            import hashlib
-        except ImportError:
-            msg = "No hashlib or MD5 module available, CacheDir() not supported"
-            SCons.Warnings.warn(SCons.Warnings.NoMD5ModuleWarning, msg)
-            path = None
         self.path = path
         self.current_cache_debug = None
         self.debugFP = None
diff --git a/src/engine/SCons/Warnings.py b/src/engine/SCons/Warnings.py
index 2495b89..833a9a0 100644
--- a/src/engine/SCons/Warnings.py
+++ b/src/engine/SCons/Warnings.py
@@ -74,9 +74,6 @@ class MisleadingKeywordsWarning(WarningOnByDefault):
 class MissingSConscriptWarning(WarningOnByDefault):
     pass
 
-class NoMD5ModuleWarning(WarningOnByDefault):
-    pass
-
 class NoMetaclassSupportWarning(WarningOnByDefault):
     pass
 
-- 
cgit v0.12