Merge "Update log translation hacking rule"

os_win/_hacking/checks.py

@@ -17,8 +17,6 @@ import ast
 import os
 import re
 
-import pep8
-
 from os_win.utils.winapi import libs as w_lib
 
 """
@@ -61,17 +59,14 @@ asse_true_false_with_in_or_not_in_spaces = re.compile(
     r"[\[|'|\"](, .*)?\)")
 asse_raises_regexp = re.compile(r"assertRaisesRegexp\(")
 conf_attribute_set_re = re.compile(r"CONF\.[a-z0-9_.]+\s*=\s*\w")
-log_translation = re.compile(
+_all_log_levels = {'critical', 'error', 'exception', 'info',
-    r"(.)*LOG\.(audit|error|critical)\(\s*('|\")")
+                   'warning', 'debug'}
-log_translation_info = re.compile(
+# Since _Lx() have been removed, we just need to check _()
-    r"(.)*LOG\.(info)\(\s*(_\(|'|\")")
+_log_translation_hint = re.compile(
-log_translation_exception = re.compile(
+    r".*LOG\.(%(levels)s)\(\s*(%(hints)s)\(" % {
-    r"(.)*LOG\.(exception)\(\s*(_\(|'|\")")
+        'levels': '|'.join(_all_log_levels),
-log_translation_LW = re.compile(
+        'hints': '_',
-    r"(.)*LOG\.(warning|warn)\(\s*(_\(|'|\")")
+    })
-translated_log = re.compile(
-    r"(.)*LOG\.(audit|error|info|critical|exception)"
-    "\(\s*_\(\s*('|\")")
 mutable_default_args = re.compile(r"^\s*def .+\((.+=\{\}|.+=\[\])")
 string_translation = re.compile(r"[^_]*_\(\s*('|\")")
 underscore_import_check = re.compile(r"(.)*import _(.)*")
@@ -187,21 +182,20 @@ def assert_equal_none(logical_line):
                "sentences not allowed")
 
 
-def no_translate_debug_logs(logical_line, filename):
+def no_translate_logs(logical_line):
-    """Check for 'LOG.debug(_('
+    """Check for 'LOG.*(_('
 
-    As per our translation policy,
+    Starting with the Pike series, OpenStack no longer supports log
-    https://wiki.openstack.org/wiki/LoggingStandards#Log_Translation
+    translation. We shouldn't translate logs.
-    we shouldn't translate debug level logs.
 
-    * This check assumes that 'LOG' is a logger.
+    - This check assumes that 'LOG' is a logger.
-    * Use filename so we can start enforcing this in specific folders instead
+    - Use filename so we can start enforcing this in specific folders
-      of needing to do so all at once.
+      instead of needing to do so all at once.
 
-    N319
+    C312
     """
-    if logical_line.startswith("LOG.debug(_("):
+    if _log_translation_hint.match(logical_line):
-        yield(0, "N319 Don't translate debug level logs")
+        yield(0, "C312: Log messages should not be translated!")
 
 
 def no_import_translation_in_tests(logical_line, filename):
@@ -233,26 +227,6 @@ def no_setting_conf_directly_in_tests(logical_line, filename):
                       "forbidden. Use self.flags(option=value) instead")
 
 
-def validate_log_translations(logical_line, physical_line, filename):
-    # Translations are not required in the test directory
-    if "os_win/tests" in filename:
-        return
-    if pep8.noqa(physical_line):
-        return
-    msg = "N328: LOG.info messages require translations `_LI()`!"
-    if log_translation_info.match(logical_line):
-        yield (0, msg)
-    msg = "N329: LOG.exception messages require translations `_LE()`!"
-    if log_translation_exception.match(logical_line):
-        yield (0, msg)
-    msg = "N330: LOG.warning, LOG.warn messages require translations `_LW()`!"
-    if log_translation_LW.match(logical_line):
-        yield (0, msg)
-    msg = "N321: Log messages require translations!"
-    if log_translation.match(logical_line):
-        yield (0, msg)
-
-
 def no_mutable_default_args(logical_line):
     msg = "N322: Method's default argument shouldn't be mutable!"
     if mutable_default_args.match(logical_line):
@@ -275,8 +249,7 @@ def check_explicit_underscore_import(logical_line, filename):
     elif (underscore_import_check.match(logical_line) or
           custom_underscore_check.match(logical_line)):
         UNDERSCORE_IMPORT_FILES.append(filename)
-    elif (translated_log.match(logical_line) or
+    elif string_translation.match(logical_line):
-          string_translation.match(logical_line)):
         yield(0, "N323: Found use of _() without explicit import of _ !")
 
 
@@ -455,9 +428,8 @@ def factory(register):
     register(assert_equal_type)
     register(assert_equal_none)
     register(assert_raises_regexp)
-    register(no_translate_debug_logs)
+    register(no_translate_logs)
     register(no_setting_conf_directly_in_tests)
-    register(validate_log_translations)
     register(no_mutable_default_args)
     register(check_explicit_underscore_import)
     register(use_jsonutils)

os_win/tests/unit/test_hacking.py

@@ -127,3 +127,11 @@ class HackingTestCase(test_base.OsWinBaseTestCase):
 
         code = "_fake_kernel32.WaitNamedPipeW(x, y)"
         self._assert_has_no_errors(code, checker)
+
+    def test_no_log_translations(self):
+        for log in checks._all_log_levels:
+            bad = 'LOG.%s(_("Bad"))' % log
+            self.assertEqual(1, len(list(checks.no_translate_logs(bad))))
+            # Catch abuses when used with a variable and not a literal
+            bad = 'LOG.%s(_(msg))' % log
+            self.assertEqual(1, len(list(checks.no_translate_logs(bad))))

tox.ini

@@ -33,8 +33,6 @@ commands = sphinx-build -a -E -W -d releasenotes/build/doctrees -b html releasen
 commands = oslo_debug_helper -t os_win/tests/unit {posargs}
 
 [flake8]
-# N321,N328,N329,N330 Remove log translations
-ignore = N321,N328,N329,N330
 show-source = True
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
@@ -42,4 +40,3 @@ max-complexity=25
 
 [hacking]
 local-check-factory = os_win._hacking.checks.factory
-import_exceptions = os_win._i18n