~ubuntu-branches/ubuntu/oneiric/loggerhead/oneiric

« back to all changes in this revision

Viewing changes to __init__.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, Max Bowsher
  • Date: 2010-12-18 14:43:23 UTC
  • mfrom: (4.1.5 sid)
  • Revision ID: james.westby@ubuntu.com-20101218144323-crnmzzz80vi8enlk
Tags: 1.18-1
[ Max Bowsher ]
* New upstream release.
 + Depends on bzr >= 1.17. Closes: #605653
* Remove remnants of patching to use the system YUI, which actually broke
  the use of YUI entirely. Loggerhead requires YUI 3, which is
  not packaged yet. Until it is, include YUI.

Show diffs side-by-side

added added

removed removed

Lines of Context:
64
64
        import sys
65
65
 
66
66
        logger = logging.getLogger('loggerhead')
67
 
        log_level = config.get_log_level()
68
 
        if log_level is not None:
69
 
            logger.setLevel(log_level)
70
67
        handler = logging.StreamHandler(sys.stderr)
71
68
        handler.setLevel(logging.DEBUG)
72
69
        logger.addHandler(handler)
73
70
        logging.getLogger('simpleTAL').addHandler(handler)
74
71
        logging.getLogger('simpleTALES').addHandler(handler)
75
 
        def _restrict_logging(logger_name):
76
 
            logger = logging.getLogger(logger_name)
77
 
            if logger.getEffectiveLevel() < logging.INFO:
78
 
                logger.setLevel(logging.INFO)
79
 
        # simpleTAL is *very* verbose in DEBUG mode, which is otherwise the
80
 
        # default. So quiet it up a bit.
81
 
        _restrict_logging('simpleTAL')
82
 
        _restrict_logging('simpleTALES')
83
 
 
84
 
 
85
72
 
86
73
 
87
74
    def _ensure_loggerhead_path():
154
141
 
155
142
    def load_tests(standard_tests, module, loader):
156
143
        _ensure_loggerhead_path()
157
 
        try:
158
 
            import bzrlib.plugins.loggerhead.loggerhead.tests
159
 
        except ImportError:
160
 
            tests = ['loggerhead.tests']
161
 
        else:
162
 
            tests = ['bzrlib.plugins.loggerhead.loggerhead.tests']
163
144
        standard_tests.addTests(loader.loadTestsFromModuleNames(
164
 
            tests))
 
145
            ['bzrlib.plugins.loggerhead.loggerhead.tests']))
165
146
        return standard_tests