Skip to content

Commit c405a6d

Browse files
authored
Merge pull request #283 from wpoely86/panlint2
panlint: store results of union
2 parents 7b012ac + 6ec2325 commit c405a6d

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

panc/src/main/scripts/panlint/panlint.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -583,11 +583,11 @@ def lint_file(filename, allow_mvn_templates=False, ignore_components=None, suppr
583583
components_included = get_components_included(raw_text)
584584

585585
# add ignored components
586-
components_included.union(ignore_components)
586+
components_included = components_included.union(set(ignore_components))
587587

588588
# Is the current file part of the source tree of a component?
589589
# If so, regard the component config as being included
590-
components_included.union(get_components_from_filename(filename))
590+
components_included = components_included.union(get_components_from_filename(filename))
591591

592592
# Start out with no check suppression
593593
suppressors = set()

panc/src/main/scripts/panlint/tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from sys import argv
2121
from os.path import basename, dirname, join
2222
from io import StringIO
23-
import mock
23+
from unittest import mock
2424
import six
2525

2626
import panlint

0 commit comments

Comments
 (0)