1 files changed, 4 insertions, 2 deletions
diff --git a/pycodestyle.py b/pycodestyle.py
index f5d2f89..c091639 100755
--- a/pycodestyle.py
+++ b/pycodestyle.py
@@ -1393,8 +1393,10 @@ def comparison_to_singleton(logical_line, noqa):
     None was set to some other value.  The other value might have a type
     (such as a container) that could be false in a boolean context!
     """
-    match = not noqa and COMPARE_SINGLETON_REGEX.search(logical_line)
-    if match:
+    if noqa:
+        return
+
+    for match in COMPARE_SINGLETON_REGEX.finditer(logical_line):
         singleton = match.group(1) or match.group(3)
         same = (match.group(2) == '==')