diff -r 654b9e1966f7 -r 525fdb738975 contrib/check-code.py --- a/contrib/check-code.py Fri May 11 18:41:04 2012 +0200 +++ b/contrib/check-code.py Sat May 12 15:54:54 2012 +0200 @@ -139,7 +139,8 @@ (r' x+[xo][\'"]\n\s+[\'"]x', 'string join across lines with no space'), (r'[^\n]\Z', "no trailing newline"), (r'(\S[ \t]+|^[ \t]+)\n', "trailing whitespace"), -# (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', "don't use underbars in identifiers"), +# (r'^\s+[^_ \n][^_. \n]+_[^_\n]+\s*=', +# "don't use underbars in identifiers"), (r'^\s+(self\.)?[A-za-z][a-z0-9]+[A-Z]\w* = ', "don't use camelcase in identifiers"), (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+',