From 46f9648aa16009137c407eefcb7ad5f80688a54f Mon Sep 17 00:00:00 2001
From: Matt Clay <matt@mystile.com>
Date: Wed, 8 Feb 2017 11:55:47 -0800
Subject: [PATCH] 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.
---
 test/sanity/validate-modules/validate-modules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/sanity/validate-modules/validate-modules b/test/sanity/validate-modules/validate-modules
index 6b626f55e45..e60c36a0f6f 100755
--- 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,