From: Martin Basti <martin.basti@gmail.com>
Date: Sun, 26 Jun 2016 21:51:57 +0000 (+0200)
Subject: Pylint: enable undefined-variable check
X-Git-Tag: v1.15.0~42^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=366e15bf76665fdd48b12dc2917cecdd5702e2d7;p=thirdparty%2Fdnspython.git

Pylint: enable undefined-variable check
---

diff --git a/dns/_compat.py b/dns/_compat.py
index e56d5a1c..a94b8422 100644
--- a/dns/_compat.py
+++ b/dns/_compat.py
@@ -19,10 +19,10 @@ if sys.version_info > (3,):
     def maybe_encode(x):
         return x.encode()
 else:
-    text_type = unicode  # pylint: disable=unicode-builtin
+    text_type = unicode  # pylint: disable=unicode-builtin, undefined-variable
     binary_type = str
     string_types = (
-        basestring,  # pylint: disable=basestring-builtin
+        basestring,  # pylint: disable=basestring-builtin, undefined-variable
     )
     unichr = unichr  # pylint: disable=unichr-builtin
     def maybe_decode(x):
diff --git a/dns/resolver.py b/dns/resolver.py
index 400ed74f..62ebb2e5 100644
--- a/dns/resolver.py
+++ b/dns/resolver.py
@@ -699,7 +699,7 @@ class Resolver(object):
         """Extract DNS info from a registry key."""
         try:
             servers, rtype = _winreg.QueryValueEx(key, 'NameServer')
-        except WindowsError:
+        except WindowsError:  # pylint: disable=undefined-variable
             servers = None
         if servers:
             self._config_win32_nameservers(servers)
@@ -707,12 +707,12 @@ class Resolver(object):
                 dom, rtype = _winreg.QueryValueEx(key, 'Domain')
                 if dom:
                     self._config_win32_domain(dom)
-            except WindowsError:
+            except WindowsError:  # pylint: disable=undefined-variable
                 pass
         else:
             try:
                 servers, rtype = _winreg.QueryValueEx(key, 'DhcpNameServer')
-            except WindowsError:
+            except WindowsError:  # pylint: disable=undefined-variable
                 servers = None
             if servers:
                 self._config_win32_nameservers(servers)
@@ -720,11 +720,11 @@ class Resolver(object):
                     dom, rtype = _winreg.QueryValueEx(key, 'DhcpDomain')
                     if dom:
                         self._config_win32_domain(dom)
-                except WindowsError:
+                except WindowsError:  # pylint: disable=undefined-variable
                     pass
         try:
             search, rtype = _winreg.QueryValueEx(key, 'SearchList')
-        except WindowsError:
+        except WindowsError:  # pylint: disable=undefined-variable
             search = None
         if search:
             self._config_win32_search(search)
@@ -826,7 +826,7 @@ class Resolver(object):
                 (nte, ttype) = _winreg.QueryValueEx(interface_key,
                                                     'NTEContextList')
                 return nte is not None
-            except WindowsError:
+            except WindowsError:  # pylint: disable=undefined-variable
                 return False
 
     def _compute_timeout(self, start):
diff --git a/pylintrc b/pylintrc
index cf1db398..578b3fdd 100644
--- a/pylintrc
+++ b/pylintrc
@@ -40,7 +40,6 @@ disable=
     round-builtin,
     superfluous-parens,
     too-many-lines,
-    undefined-variable,
     unused-argument,
     unused-variable,
     wrong-import-order,