diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-12-10 00:09:52 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 00:09:52 (GMT) |
| commit | 527e40716c9539deb3ae8cc44fc911bc42096266 (patch) | |
| tree | 4dc5984a488f0d5f694697f82320bc5aad4fe4e6 /src | |
| parent | 45a657607b8ce3f306c549664ecf708136bbfe1d (diff) | |
| parent | b0c97773c93beeadfeea95ecd1a83c2817dc3b56 (diff) | |
| download | SCons-527e40716c9539deb3ae8cc44fc911bc42096266.zip SCons-527e40716c9539deb3ae8cc44fc911bc42096266.tar.gz SCons-527e40716c9539deb3ae8cc44fc911bc42096266.tar.bz2 | |
Merge pull request #24 from ajf58/tidy-warnings
Tidy CLI Warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 3 | ||||
| -rw-r--r-- | src/engine/SCons/CacheDir.py | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Warnings.py | 6 |
3 files changed, 4 insertions, 12 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index da4e6ae..6f1f2d0 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -47,6 +47,9 @@ RELEASE 3.1.0.alpha.yyyymmdd - NEW DATE WILL BE INSERTED HERE From Zachary Tessler: - Fix incorrect warning for repeated identical builder calls that use overrides + From Andrew Featherstone + - Removed unused --warn options from the man page and source code. + RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700 NOTE: This is a major release. You should expect that some targets may rebuild when upgrading. 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..e8158a4 100644 --- a/src/engine/SCons/Warnings.py +++ b/src/engine/SCons/Warnings.py @@ -74,12 +74,6 @@ class MisleadingKeywordsWarning(WarningOnByDefault): class MissingSConscriptWarning(WarningOnByDefault): pass -class NoMD5ModuleWarning(WarningOnByDefault): - pass - -class NoMetaclassSupportWarning(WarningOnByDefault): - pass - class NoObjectCountWarning(WarningOnByDefault): pass |