/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 breezy/plugins/news_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/news_merge/__init__.py
34
34
"""
35
35
 
36
36
# Since we are a built-in plugin we share the breezy version
37
 
from breezy import version_info
38
 
from breezy.hooks import install_lazy_named_hook
 
37
from ... import version_info
 
38
from ...hooks import install_lazy_named_hook
39
39
 
40
40
 
41
41
def news_merge_hook(merger):
42
42
    """Merger.merge_file_content hook for bzr-format NEWS files."""
43
 
    from breezy.plugins.news_merge.news_merge import NewsMerger
 
43
    from .news_merge import NewsMerger
44
44
    return NewsMerger(merger)
45
45
 
46
46