Mercurial > babel > old > mirror
comparison 0.9.x/babel/messages/frontend.py @ 526:22ad1d9936e7 stable
merge r573, r575 from trunk to 0.9 branch
author | fschwarz |
---|---|
date | Sat, 05 Mar 2011 14:58:58 +0000 |
parents | cd2dec0823c9 |
children |
comparison
equal
deleted
inserted
replaced
519:931424efdcf0 | 526:22ad1d9936e7 |
---|---|
624 help='print as little as possible') | 624 help='print as little as possible') |
625 self.parser.set_defaults(list_locales=False, loglevel=logging.INFO) | 625 self.parser.set_defaults(list_locales=False, loglevel=logging.INFO) |
626 | 626 |
627 options, args = self.parser.parse_args(argv[1:]) | 627 options, args = self.parser.parse_args(argv[1:]) |
628 | 628 |
629 # Configure logging | 629 self._configure_logging(options.loglevel) |
630 self.log = logging.getLogger('babel') | |
631 self.log.setLevel(options.loglevel) | |
632 handler = logging.StreamHandler() | |
633 handler.setLevel(options.loglevel) | |
634 formatter = logging.Formatter('%(message)s') | |
635 handler.setFormatter(formatter) | |
636 self.log.addHandler(handler) | |
637 | |
638 if options.list_locales: | 630 if options.list_locales: |
639 identifiers = localedata.list() | 631 identifiers = localedata.list() |
640 longest = max([len(identifier) for identifier in identifiers]) | 632 longest = max([len(identifier) for identifier in identifiers]) |
641 identifiers.sort() | 633 identifiers.sort() |
642 format = u'%%-%ds %%s' % (longest + 1) | 634 format = u'%%-%ds %%s' % (longest + 1) |
655 cmdname = args[0] | 647 cmdname = args[0] |
656 if cmdname not in self.commands: | 648 if cmdname not in self.commands: |
657 self.parser.error('unknown command "%s"' % cmdname) | 649 self.parser.error('unknown command "%s"' % cmdname) |
658 | 650 |
659 return getattr(self, cmdname)(args[1:]) | 651 return getattr(self, cmdname)(args[1:]) |
652 | |
653 def _configure_logging(self, loglevel): | |
654 self.log = logging.getLogger('babel') | |
655 self.log.setLevel(loglevel) | |
656 # Don't add a new handler for every instance initialization (#227), this | |
657 # would cause duplicated output when the CommandLineInterface as an | |
658 # normal Python class. | |
659 if self.log.handlers: | |
660 handler = self.log.handlers[0] | |
661 else: | |
662 handler = logging.StreamHandler() | |
663 self.log.addHandler(handler) | |
664 handler.setLevel(loglevel) | |
665 formatter = logging.Formatter('%(message)s') | |
666 handler.setFormatter(formatter) | |
660 | 667 |
661 def _help(self): | 668 def _help(self): |
662 print self.parser.format_help() | 669 print self.parser.format_help() |
663 print "commands:" | 670 print "commands:" |
664 longest = max([len(command) for command in self.commands]) | 671 longest = max([len(command) for command in self.commands]) |