Fix type() usage check in validate-modules.

This avoids false positives when 'if' or 'or' are in a string preceding the use of type() on the same line.
jjlorenzo · Feb 8, 2017 · 46f9648 · 46f9648
1 parent 43ae127
commit 46f9648
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/sanity/validate-modules/validate-modules b/test/sanity/validate-modules/validate-modules
@@ -44,7 +44,7 @@ from voluptuous.humanize import humanize_error
 
 BLACKLIST_DIRS = frozenset(('.git', 'test', '.github', '.idea'))
 INDENT_REGEX = re.compile(r'([\t]*)')
-TYPE_REGEX = re.compile(r'.*(if|or)(\s+.*|\s+)(?<!_)(?<!str\()type\(.*')
+TYPE_REGEX = re.compile(r'.*(if|or)(\s+[^"\']*|\s+)(?<!_)(?<!str\()type\(.*')
 BLACKLIST_IMPORTS = {
     'requests': {
         'new_only': True,