util: improved the check for the existence of the 'buffer' builtin
2to3 is unable to translate '__builtin__' calls to 'builtins' when
hasattr is used (as in hasattr(__builtin__, buffer)). Translating the
check to the format
try:
whatever
except NameError
# define whatever
__builtin__.whatever = whatever
is a correct way of checking for the name and has the benefit of being
translated by 2to3. This patch implements the same idea for the
aforementioned example.
#!/bin/sh
#cd `dirname $0`
cat > correct.py <<EOF
def toto(arg1, arg2):
del arg2
return (5 + 6, 9)
EOF
cat > wrong.py <<EOF
def toto( arg1, arg2):
del(arg2)
return ( 5+6, 9)
EOF
cat > quote.py <<EOF
# let's use quote in comments
(''' ( 4x5 )
but """\\''' and finally''',
"""let's fool checkpatch""", '1+2',
'"""', 42+1, """and
( 4-1 ) """, "( 1+1 )\" and ")
a, '\\\\\\\\', "\\\\\\" x-2", "c-1"
EOF
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):
pass
EOF
check_code=`dirname $0`/../contrib/check-code.py
${check_code} ./wrong.py ./correct.py ./quote.py ./non-py24.py