/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/hooks.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-13 17:06:15 UTC
  • mto: (4634.52.17 2.0)
  • mto: This revision was merged to the branch mainline in revision 4747.
  • Revision ID: john@arbash-meinel.com-20091013170615-4q6ff014r3cj5ecb
https://launchpad.net/bugs/440062
Fix bug #44062, Always suppress deprecation warnings.

Python 2.6 now 'comes with' a deprecation warning suppression as part of
the threading module. So the current check that says 'if someone manually
configured a deprecation warning filter, don't add ours' now breaks
because there is always one present.
So instead, we just always suppress all deprecation warnings if we are in
a 'final' release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/hooks.py
1
 
# Copyright (C) 2007-2010 Canonical Ltd
 
1
# Copyright (C) 2007, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
"""Support for plugin hooking logic."""
19
19
from bzrlib import registry
20
20
from bzrlib.lazy_import import lazy_import
 
21
from bzrlib.symbol_versioning import deprecated_method
21
22
lazy_import(globals(), """
22
23
import textwrap
23
24
 
44
45
    'bzrlib.info', 'InfoHooks')
45
46
known_hooks.register_lazy(('bzrlib.lock', 'Lock.hooks'), 'bzrlib.lock',
46
47
    'LockHooks')
47
 
known_hooks.register_lazy(('bzrlib.merge', 'Merger.hooks'), 'bzrlib.merge',
48
 
    'MergeHooks')
49
48
known_hooks.register_lazy(('bzrlib.msgeditor', 'hooks'), 'bzrlib.msgeditor',
50
49
    'MessageEditorHooks')
51
50
known_hooks.register_lazy(('bzrlib.mutabletree', 'MutableTree.hooks'),
58
57
    ('bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilder.hooks'),
59
58
    'bzrlib.version_info_formats.format_rio', 'RioVersionInfoBuilderHooks')
60
59
known_hooks.register_lazy(
61
 
    ('bzrlib.merge_directive', 'BaseMergeDirective.hooks'),
 
60
    ('bzrlib.merge_directive', '_BaseMergeDirective.hooks'),
62
61
    'bzrlib.merge_directive', 'MergeDirectiveHooks')
63
62
 
64
63
 
278
277
 
279
278
See `Using hooks`_ in the User Guide for examples.
280
279
 
281
 
.. _Using hooks: ../user-guide/hooks.html
 
280
.. _Using hooks: ../user-guide/index.html#using-hooks
282
281
 
283
282
The class that contains each hook is given before the hooks it supplies. For
284
283
instance, BranchHooks as the class is the hooks class for