← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_bundle.py

  • Committer: Robert Collins
  • Date: 2008-09-02 05:28:37 UTC
  • mfrom: (3675 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3677.
  • Revision ID: robertc@robertcollins.net-20080902052837-ec3qlv41q5e7f6fl
Resolve conflicts with NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
17
17
from cStringIO import StringIO
18
18
import os
19
19
import sys
20
 
import tempfile
21
20
 
22
21
from bzrlib import (
23
22
    bzrdir,
24
23
    errors,
25
24
    inventory,
 
25
    osutils,
26
26
    repository,
27
27
    revision as _mod_revision,
28
28
    treebuilder,
455
455
        """
456
456
 
457
457
        if checkout_dir is None:
458
 
            checkout_dir = tempfile.mkdtemp(prefix='test-branch-', dir='.')
 
458
            checkout_dir = osutils.mkdtemp(prefix='test-branch-', dir='.')
459
459
        else:
460
460
            if not os.path.exists(checkout_dir):
461
461
                os.mkdir(checkout_dir)