/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/po_merge/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/po_merge/__init__.py
56
56
from ... import (
57
57
    config,
58
58
    # Since we are a built-in plugin we share the breezy version
59
 
    version_info,
 
59
    version_info,  # noqa: F401
60
60
    )
61
61
from ...hooks import install_lazy_named_hook
62
62
 
79
79
 
80
80
 
81
81
install_lazy_named_hook("breezy.merge", "Merger.hooks", "merge_file_content",
82
 
    po_merge_hook, ".po file merge")
 
82
                        po_merge_hook, ".po file merge")
83
83
 
84
84
 
85
85
def load_tests(loader, basic_tests, pattern):
87
87
        'tests',
88
88
        ]
89
89
    basic_tests.addTest(loader.loadTestsFromModuleNames(
90
 
            ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
 
90
        ["%s.%s" % (__name__, tmn) for tmn in testmod_names]))
91
91
    return basic_tests
92