← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/lazy_import.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-09-23 09:00:18 UTC
  • mfrom: (5439.1.1 merge-2.2-into-devel)
  • Revision ID: pqm@pqm.ubuntu.com-20100923090018-01aj4ifyzaps50bo
(spiv) Merge lp:bzr/2.2. (Andrew Bennetts)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/lazy_import.py
87
87
                          " to another variable?",
88
88
                extra=e)
89
89
        obj = factory(self, scope, name)
 
90
        if obj is self:
 
91
            raise errors.IllegalUseOfScopeReplacer(name, msg="Object tried"
 
92
                " to replace itself, check it's not using its own scope.")
90
93
        if ScopeReplacer._should_proxy:
91
94
            object.__setattr__(self, '_real_obj', obj)
92
95
        scope[name] = obj