[PATCH 5 of 5] util: drop local aliases for md5, sha1, sha256, and sha512

Augie Fackler raf at durin42.com
Fri Jun 10 00:41:18 EDT 2016


# HG changeset patch
# User Augie Fackler <raf at durin42.com>
# Date 1465532003 14400
#      Fri Jun 10 00:13:23 2016 -0400
# Node ID fad6ce69483b3b25c6bd9fb2bd9e2e31467f207f
# Parent  c53644cf3126d5fe51a32b464ecf77c3ea2ca549
util: drop local aliases for md5, sha1, sha256, and sha512

This used to be needed to paper over hashlib not being in all Pythons
we support, but that's not a problem anymore, so we can simplify
things a little bit.

diff --git a/mercurial/util.py b/mercurial/util.py
--- a/mercurial/util.py
+++ b/mercurial/util.py
@@ -64,10 +64,6 @@ if os.name == 'nt':
 else:
     from . import posix as platform
 
-md5 = hashlib.md5
-sha1 = hashlib.sha1
-sha256 = hashlib.sha256
-sha512 = hashlib.sha512
 _ = i18n._
 
 cachestat = platform.cachestat
@@ -138,9 +134,9 @@ def safehasattr(thing, attr):
     return getattr(thing, attr, _notset) is not _notset
 
 DIGESTS = {
-    'md5': md5,
-    'sha1': sha1,
-    'sha512': sha512,
+    'md5': hashlib.md5,
+    'sha1': hashlib.sha1,
+    'sha512': hashlib.sha512,
 }
 # List of digest types from strongest to weakest
 DIGESTS_BY_STRENGTH = ['sha512', 'sha1', 'md5']


More information about the Mercurial-devel mailing list