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/tools/files.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'ipsilon/tools/files.py') diff --git a/ipsilon/tools/files.py b/ipsilon/tools/files.py index 5847654..857a2fe 100644 --- a/ipsilon/tools/files.py +++ b/ipsilon/tools/files.py @@ -39,6 +39,6 @@ def fix_user_dirs(path, user=None, mode=0700): def write_from_template(destfile, template, opts): with open(template) as f: t = Template(f.read()) - text = t.substitute(**opts) # pylint: disable=star-args + text = t.substitute(**opts) with open(destfile, 'w+') as f: f.write(text) -- cgit