From 437f5be7c89060f535ec090935a74979cc50e102 Mon Sep 17 00:00:00 2001 From: Eric Harney Date: Mon, 4 Apr 2016 16:44:57 -0400 Subject: [PATCH] Hacking: Ignore tools/ for C303 These files should use print statements, because they're normal Python. Change-Id: I8ee51a3a6a3514ab71de438c14e0d2aa2fa4606e --- cinder/hacking/checks.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/cinder/hacking/checks.py b/cinder/hacking/checks.py index 7652ae655a8..3b3e2f9b14c 100644 --- a/cinder/hacking/checks.py +++ b/cinder/hacking/checks.py @@ -414,15 +414,19 @@ def check_unicode_usage(logical_line, noqa): def check_no_print_statements(logical_line, filename, noqa): - # The files in cinder/cmd do need to use 'print()' so - # we don't need to check those files. Other exemptions - # should use '# noqa' to avoid failing here. - if "cinder/cmd" not in filename and not noqa: - if re.match(no_print_statements, logical_line): - msg = ("C303: print() should not be used. " - "Please use LOG.[info|error|warning|exception|debug]. " - "If print() must be used, use '# noqa' to skip this check.") - yield(0, msg) + # CLI and utils programs do need to use 'print()' so + # we shouldn't check those files. + if noqa: + return + + if "cinder/cmd" in filename or "tools/" in filename: + return + + if re.match(no_print_statements, logical_line): + msg = ("C303: print() should not be used. " + "Please use LOG.[info|error|warning|exception|debug]. " + "If print() must be used, use '# noqa' to skip this check.") + yield(0, msg) def check_no_log_audit(logical_line):