Pylint: enable import-error check

yarda7 · Jun 26, 2016 · c56a276 · c56a276
1 parent d7e0aef
commit c56a276
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/dns/entropy.py b/dns/entropy.py
@@ -33,13 +33,13 @@ def __init__(self, seed=None):
             import hashlib
             self.hash = hashlib.sha1()
             self.hash_len = 20
-        except:
+        except ImportError:
             try:
                 import sha
                 self.hash = sha.new()
                 self.hash_len = 20
-            except:
-                import md5
+            except ImportError:
+                import md5  # pylint: disable=import-error
                 self.hash = md5.new()
                 self.hash_len = 16
         self.pool = bytearray(b'\0' * self.hash_len)

diff --git a/dns/resolver.py b/dns/resolver.py
@@ -46,7 +46,7 @@
     try:
         import winreg as _winreg
     except ImportError:
-        import _winreg
+        import _winreg  # pylint: disable=import-error
 
 class NXDOMAIN(dns.exception.DNSException):
 

diff --git a/pylintrc b/pylintrc
@@ -30,7 +30,6 @@ disable=
     fixme,
     getslice-method,
     global-statement,
-    import-error,
     invalid-name,
     long-builtin,
     missing-docstring,