# HG changeset patch
# User Martin Geisler <mg@aragost.com>
# Date 2010-06-15 07:55:59
# Node ID f325db39c8b946502b62fc9cbcdad3c19dfa0d82
# Parent  aecabad8dd7a7a841d80e7080f92feead3705295

check-code: catch format(), introduced in Python 2.6

diff --git a/contrib/check-code.py b/contrib/check-code.py
--- a/contrib/check-code.py
+++ b/contrib/check-code.py
@@ -92,7 +92,7 @@ pypats = [
     (r'[\x80-\xff]', "non-ASCII character literal"),
     (r'("\')\.format\(', "str.format() not available in Python 2.4"),
     (r'^\s*with\s+', "with not available in Python 2.4"),
-    (r'(?<!def)\s+(any|all)\(', "any/all not available in Python 2.4"),
+    (r'(?<!def)\s+(any|all|format)\(', "any/all/format not available in Python 2.4"),
     (r'if\s.*\selse', "if ... else form not available in Python 2.4"),
     (r'([\(\[]\s\S)|(\S\s[\)\]])', "gratuitous whitespace in () or []"),
 #    (r'\s\s=', "gratuitous whitespace before ="),
diff --git a/tests/test-check-code b/tests/test-check-code
--- a/tests/test-check-code
+++ b/tests/test-check-code
@@ -26,6 +26,7 @@ cat > non-py24.py <<EOF
 # Using builtins that does not exist in Python 2.4
 if any():
     x = all()
+    y = format(x)
 
 # Do not complain about our own definition
 def any(x):
diff --git a/tests/test-check-code.out b/tests/test-check-code.out
--- a/tests/test-check-code.out
+++ b/tests/test-check-code.out
@@ -13,7 +13,10 @@
  missing whitespace in expression
 ./non-py24.py:2:
  > if any():
- any/all not available in Python 2.4
+ any/all/format not available in Python 2.4
 ./non-py24.py:3:
  >     x = all()
- any/all not available in Python 2.4
+ any/all/format not available in Python 2.4
+./non-py24.py:4:
+ >     y = format(x)
+ any/all/format not available in Python 2.4