← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_lazy_import.py

  • Committer: Martin
  • Date: 2010-05-25 17:27:52 UTC
  • mfrom: (5254 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5257.
  • Revision ID: gzlist@googlemail.com-20100525172752-amm089xcikv968sw
Merge bzr.dev to unite with similar changes already made

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_lazy_import.py
452
452
        self.actions = []
453
453
        InstrumentedImportReplacer.use_actions(self.actions)
454
454
 
 
455
        sys.path.append(base_path)
 
456
        self.addCleanup(sys.path.remove, base_path)
 
457
 
455
458
        original_import = __import__
456
459
        def instrumented_import(mod, scope1, scope2, fromlist):
457
460
            self.actions.append(('import', mod, fromlist))
458
461
            return original_import(mod, scope1, scope2, fromlist)
459
 
 
460
462
        def cleanup():
461
 
            if base_path in sys.path:
462
 
                sys.path.remove(base_path)
463
463
            __builtins__['__import__'] = original_import
464
464
        self.addCleanup(cleanup)
465
 
        sys.path.append(base_path)
466
465
        __builtins__['__import__'] = instrumented_import
467
466
 
468
467
    def create_modules(self):