From 1bcc0d697dd37a9268641f0cbaa7e9e781552233 Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Thu, 7 May 2015 12:33:40 -0400 Subject: pylint 1.4.3 version fixes Pylint 1.4.3 completely stopped recognizing the star-args condition. In order to avoid pylint error with > 1.4.3 stop caring for star-args and add cmdline option to ignore those errors completly so older pylint versions are happy too. Also fix type() vs isinstance() checks, isinstance is generally a more correct approach to check for classes. In some 'admin' files the type() -> isinstance() fix required to invert the order in which ComplexList and MappingList are checked as the latter is a subclass of ComplexList, so it needs to be checked first otherwise the check for isinstance(option, ComplexList) matches for both and the code stops functioning properly. Signed-off-by: Simo Sorce Reviewed-by: Rob Crittenden --- ipsilon/info/infoldap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ipsilon/info/infoldap.py') diff --git a/ipsilon/info/infoldap.py b/ipsilon/info/infoldap.py index 84b4098..f87b37c 100644 --- a/ipsilon/info/infoldap.py +++ b/ipsilon/info/infoldap.py @@ -119,7 +119,7 @@ Info plugin that uses LDAP to retrieve user data. """ raise Exception('No unique user object could be found!') data = dict() for name, value in result[0][1].iteritems(): - if type(value) is list and len(value) == 1: + if isinstance(value, list) and len(value) == 1: value = value[0] data[name] = value return data -- cgit