← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/registry.py

  • Committer: Jelmer Vernooij
  • Date: 2011-02-24 16:09:47 UTC
  • mto: (5582.10.69 weave-fmt-plugin)
  • mto: This revision was merged to the branch mainline in revision 5688.
  • Revision ID: jelmer@samba.org-20110224160947-e7kqclxnjif28v5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/registry.py
239
239
        Registry.__init__(self)
240
240
        self._other_registry = other_registry
241
241
 
 
242
    def register(self, key, obj, help=None, info=None,
 
243
                 override_existing=False):
 
244
        Registry.register(self, key, obj, help=help, info=info,
 
245
            override_existing=override_existing)
 
246
        if self._other_registry is not None:
 
247
            self._other_registry.register(key, obj, help=help,
 
248
                info=info, override_existing=override_existing)
 
249
 
242
250
    def register_lazy(self, key, module_name, member_name,
243
251
                      help=None, info=None,
244
252
                      override_existing=False):
255
263
        if callable(r):
256
264
            r = r()
257
265
        return r
258
 
 
259