# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2014-05-14 00:22:40
# Node ID 507ce509fd22fedebeebee16b599ba2912ec6003
# Parent  a7a9d84f5e4ac341247a575afde5eae3fc509439

filterpyflakes: make memoryview filtering unconditional

diff --git a/tests/filterpyflakes.py b/tests/filterpyflakes.py
--- a/tests/filterpyflakes.py
+++ b/tests/filterpyflakes.py
@@ -32,11 +32,10 @@ for line in sys.stdin:
             (r"imported but unused", None),
             (r"local variable '.*' is assigned to but never used", None),
             (r"unable to detect undefined names", None),
+            (r"undefined name '.*'",
+             r"undefined name 'memoryview'")
            ]
-    if sys.version_info >= (2, 7):
-        pats.append((r"undefined name '.*'", None))
-    else:
-        pats.append((r"undefined name '.*'", r"undefined name 'memoryview'"))
+
     for msgtype, (pat, excl) in enumerate(pats):
         if re.search(pat, line) and (not excl or not re.search(excl, line)):
             break # pattern matches
diff --git a/tests/test-check-pyflakes.t b/tests/test-check-pyflakes.t
--- a/tests/test-check-pyflakes.t
+++ b/tests/test-check-pyflakes.t
@@ -17,6 +17,6 @@ run pyflakes on all tracked files ending
   tests/hghave.py:*: 'pygments' imported but unused (glob)
   tests/hghave.py:*: 'ssl' imported but unused (glob)
   contrib/win32/hgwebdir_wsgi.py:93: 'from isapi.install import *' used; unable to detect undefined names (glob)
-  tests/filterpyflakes.py:59: undefined name 'undefinedname'
+  tests/filterpyflakes.py:58: undefined name 'undefinedname'
   
 #endif