# HG changeset patch # User Augie Fackler <r...@durin42.com> # Date 1503428272 14400 # Tue Aug 22 14:57:52 2017 -0400 # Node ID 97dba357fcdb6caf5a0f9f5f074a69306a5a8950 # Parent 6a9a8a60bced4b42a4b019b2f98c97672ce7a42b tests: update test-archive to always use hashlib
We don't need the fallback to the old modules anymore. diff --git a/tests/test-archive.t b/tests/test-archive.t --- a/tests/test-archive.t +++ b/tests/test-archive.t @@ -211,15 +211,12 @@ The '-t' should override autodetection > done $ cat > md5comp.py <<EOF - > from __future__ import print_function - > try: - > from hashlib import md5 - > except ImportError: - > from md5 import md5 + > from __future__ import absolute_import, print_function + > import hashlib > import sys > f1, f2 = sys.argv[1:3] - > h1 = md5(open(f1, 'rb').read()).hexdigest() - > h2 = md5(open(f2, 'rb').read()).hexdigest() + > h1 = hashlib.md5(open(f1, 'rb').read()).hexdigest() + > h2 = hashlib.md5(open(f2, 'rb').read()).hexdigest() > print(h1 == h2 or "md5 differ: " + repr((h1, h2))) > EOF _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel