Merge pull request #197 from bastiak/pylint

Pylint

diff --cc dns/name.py
Simple merge

diff --cc dns/resolver.py
Simple merge

diff --cc dns/zone.py
Simple merge

diff --cc pylintrc
index 3f16509d00cfc5e763cf23c08f64abbbccc10751,26999071ac6e2d3cdfa5f7e40bd47867ff8a8aa1..91b4dc0aeb737c18638da08aa435e85bbca4fed7
--- 1/pylintrc
--- 2/pylintrc
+++ b/pylintrc
@@@ -17,12 -17,12 +17,11 @@@ disable
      anomalous-backslash-in-string,
      arguments-differ,
      assigning-non-slot,
-     attribute-defined-outside-init,
      bad-builtin,
      bad-continuation,
-     bare-except,
+     broad-except,
      deprecated-method,
      fixme,
 -    getslice-method,
      global-statement,
      invalid-name,
      missing-docstring,

diff --cc tests/test_zone.py
Simple merge