~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_registry.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2011-05-24 20:07:12 UTC
  • mfrom: (5901.1.2 bzr.dev-good)
  • Revision ID: pqm@pqm.ubuntu.com-20110524200712-z0ay7c4lsbg1x7qs
(jam) Tell bzr.dev that we really do want mgz's changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
215
215
        # We create a registry with "official" objects and "hidden"
216
216
        # objects. The later represent the side effects that led to bug #277048
217
217
        # and #430510
218
 
        self.registry =  registry.Registry()
 
218
        _registry = registry.Registry()
219
219
 
220
220
        def register_more():
221
 
            self.registry.register('hidden', None)
 
221
           _registry.register('hidden', None)
222
222
 
 
223
        # Avoid closing over self by binding local variable
 
224
        self.registry = _registry
223
225
        self.registry.register('passive', None)
224
226
        self.registry.register('active', register_more)
225
227
        self.registry.register('passive-too', None)
229
231
            def get_obj(inner_self):
230
232
                # Surprise ! Getting a registered object (think lazy loaded
231
233
                # module) register yet another object !
232
 
                self.registry.register('more hidden', None)
 
234
                _registry.register('more hidden', None)
233
235
                return inner_self._obj
234
236
 
235
237
        self.registry.register('hacky', None)