← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_whitebox.py

first cut at merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_whitebox.py
16
16
        job: given a path (either relative to cwd or absolute), work out
17
17
        if it is inside a branch and return the path relative to the base.
18
18
        """
19
 
        import tempfile
20
 
        from bzrlib.osutils import rmtree
 
19
        import tempfile, shutil
21
20
        
22
21
        savedir = os.getcwdu()
23
22
        dtmp = tempfile.mkdtemp()
65
64
 
66
65
        finally:
67
66
            os.chdir(savedir)
68
 
            rmtree(dtmp)
 
67
            shutil.rmtree(dtmp)