check_catalog command failing

[Jun Omae]

$ make check-ja
check-ja: python  setup.py  check_catalog -l ja  check_catalog_js -l ja  check_catalog_tracini -l ja
running check_catalog
checking catalog trac/locale/ja/LC_MESSAGES/messages.po
Traceback (most recent call last):
  File "setup.py", line 158, in <module>
    **extra
  File "/usr/lib/python2.7/distutils/core.py", line 151, in setup
    dist.run_commands()
  File "/usr/lib/python2.7/distutils/dist.py", line 953, in run_commands
    self.run_command(cmd)
  File "/usr/lib/python2.7/distutils/dist.py", line 972, in run_command
    cmd_obj.run()
  File "/src/tracdev/git/trac/dist.py", line 458, in run
    log.warning('%s:%d: %s', filename, message.lineno,
AttributeError: 'module' object has no attribute 'warning'
make: *** [check-ja] Error 1

[Jun Omae]

That line has been changed in [15327].

The log in trac.dist is distutils.log, not logging.Logger. distutils.log has warn method not warning method. I think that naming in Python library is not consistent…

It might be good to rename to distlog from log, to prevent replacing with log.warning like this:

trac/dist.py

@@ -36 +36 @@
 except ImportError:
     genshi = None
 
-from distutils import log
+from distutils import log as distlog
 from distutils.cmd import Command
 from distutils.command.build import build as _build
 from distutils.errors import DistutilsOptionError
@@ -411 +411 @@
 
             for idx, (locale, mo_file) in enumerate(mo_files):
                 js_file = js_files[idx]
-                log.info('generating messages javascript %r to %r',
-                         mo_file, js_file)
+                distlog.info('generating messages javascript %r to %r',
+                             mo_file, js_file)
 
                 with open(mo_file, 'rb') as infile:
                     t = Translations(infile, self.domain)
@@ -450 +450 @@
 
         def run(self):
             for filename in self._get_po_files():
-                log.info('checking catalog %s', filename)
+                distlog.info('checking catalog %s', filename)
                 with open(filename) as f:
                     catalog = read_po(f, domain=self.domain)
                 for message in catalog:
                     for error in self._check_message(catalog, message):
-                        log.warning('%s:%d: %s', filename, message.lineno,
-                                    error)
+                        distlog.warn('%s:%d: %s', filename, message.lineno,
+                                     error)
 
         def _get_po_files(self):
             if self.input_file:

[Ryan J Ollos]

Thanks for finding. The fix looks good to me.

[Jun Omae]

Committed in [16115].