Fix pylint issues

Author: oschwald

minfraud/validation.py

@@ -21,13 +21,14 @@
 # objects below. Given the consistent use of them, the current names seem
 # preferable to blindly following pylint.
 #
-# pylint: disable=invalid-name,redefined-variable-type,undefined-variable
+# pylint: disable=invalid-name,undefined-variable
 
 if sys.version_info[0] >= 3:
+    _unicode = str
     _unicode_or_printable_ascii = str
 else:
+    _unicode = unicode
     _unicode_or_printable_ascii = Any(unicode, Match(r'^[\x20-\x7E]*$'))
-# pylint: enable=redefined-variable-type
 
 _any_string = Any(_unicode_or_printable_ascii, str)
 
@@ -43,12 +44,8 @@
 
 
 def _ip_address(s):
-    # ipaddress accepts numeric IPs, which we don't want. Pylint on Python 3
-    # doesn't like "unicode"
-    #
-    # pylint: disable=undefined-variable
-    if (isinstance(s, str) or isinstance(s, unicode)) \
-            and not re.match(r'^\d+$', s):
+    # ipaddress accepts numeric IPs, which we don't want.
+    if isinstance(s, (str, _unicode)) and not re.match(r'^\d+$', s):
         return str(compat_ip_address(s))
     raise ValueError
 

minfraud/webservice.py

@@ -141,8 +141,7 @@ def _copy_and_clean(self, data):
                         if v is not None)
         elif isinstance(data, (list, set, tuple)):
             return [self._copy_and_clean(x) for x in data if x is not None]
-        else:
-            return data
+        return data
 
     def _user_agent(self):
         """Create User-Agent header."""