diff --git a/contrib/check-code.py b/contrib/check-code.py --- a/contrib/check-code.py +++ b/contrib/check-code.py @@ -263,8 +263,6 @@ (r'.{81}', "line too long"), (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+(self\.)?[A-Za-z][a-z0-9]+[A-Z]\w* = ', "don't use camelcase in identifiers", r'#.*camelcase-required'), (r'^\s*(if|while|def|class|except|try)\s[^[\n]*:\s*[^\\n]#\s]+', diff --git a/contrib/check-commit b/contrib/check-commit --- a/contrib/check-commit +++ b/contrib/check-commit @@ -41,12 +41,6 @@ (afterheader + r".{79,}", "summary line too long (limit is 78)"), (r"\n\+\n( |\+)\n", "adds double empty line"), (r"\n \n\+\n", "adds double empty line"), - # Forbid "_" in function name. - # - # We skip the check for cffi related functions. They use names mapping the - # name of the C function. C function names may contain "_". - (r"\n\+[ \t]+def (?!cffi)[a-z]+_[a-z]", - "adds a function with foo_bar naming"), ] word = re.compile('\S') diff --git a/tests/test-contrib-check-commit.t b/tests/test-contrib-check-commit.t --- a/tests/test-contrib-check-commit.t +++ b/tests/test-contrib-check-commit.t @@ -132,8 +132,6 @@ This has no topic and ends with a period. 19: adds double empty line + - 20: adds a function with foo_bar naming - + def blah_blah(x): 23: adds double empty line + [1]