From 1dd643933211241073df655e69ce4f81c7ed9632 Mon Sep 17 00:00:00 2001 From: Guido Trotter Date: Thu, 10 Nov 2011 13:46:54 +0000 Subject: [PATCH] Fix newer pylint's E0611 error in compat.py MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit These are triggered by our "stay-compatible" approach. Signed-off-by: Guido Trotter Reviewed-by: René Nussbaumer --- lib/compat.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/compat.py b/lib/compat.py index 53ee1fb..6515af1 100644 --- a/lib/compat.py +++ b/lib/compat.py @@ -45,11 +45,10 @@ except ImportError: # modules (hmac, for example) which have changed their behavior as well from # one version to the other. try: - # pylint: disable=F0401 + # Yes, these don't always exist, that's why we're testing # Yes, we're not using the imports in this module. - # pylint: disable=W0611 - from hashlib import md5 as md5_hash - from hashlib import sha1 as sha1_hash + from hashlib import md5 as md5_hash # pylint: disable=W0611,E0611,F0401 + from hashlib import sha1 as sha1_hash # pylint: disable=W0611,E0611,F0401 # this additional version is needed for compatibility with the hmac module sha1 = sha1_hash except ImportError: -- 1.7.10.4