Merge with stable
authorChristian Ebert <blacktrash@gmx.net>
Tue, 09 Nov 2010 10:31:54 +0000
changeset 861 bbb042e55f49
parent 859 d36150edc231 (current diff)
parent 860 1ea19e827b5b (diff)
child 863 de49207ef1a5
Merge with stable
--- a/tests/run-tests.py	Mon Nov 08 11:11:23 2010 +0000
+++ b/tests/run-tests.py	Tue Nov 09 10:31:54 2010 +0000
@@ -556,8 +556,9 @@
                 postout.append("  " + lout)
             elif (el and
                   (el.endswith(" (re)\n") and rematch(el[:-6] + '\n', lout) or
-                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)) or
-                   el.endswith(" (esc)\n") and el.decode('string-escape') == l):
+                   el.endswith(" (glob)\n") and globmatch(el[:-8] + '\n', lout)
+                   or el.endswith(" (esc)\n") and
+                      el.decode('string-escape') == l)):
                 postout.append("  " + el) # fallback regex/glob/esc match
             else:
                 if needescape(lout):