← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Vincent Ladeuil
  • Date: 2010-06-29 16:23:24 UTC
  • mto: (5247.1.12 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100629162324-ls01yzl823613kg4
Fixed as per jam's review.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
28
28
import getpass
29
29
import ntpath
30
30
import posixpath
31
 
import shutil
 
31
from shutil import rmtree
32
32
import socket
33
33
import subprocess
34
 
import tempfile
 
34
import tempfile import mkdtemp
35
35
import unicodedata
36
36
 
37
37
from bzrlib import (
383
383
basename = os.path.basename
384
384
split = os.path.split
385
385
splitext = os.path.splitext
386
 
mkdtemp = tempfile.mkdtemp
387
 
rmtree = shutil.rmtree
 
386
# These were already lazily imported into local scope
 
387
# mkdtemp = tempfile.mkdtemp
 
388
# rmtree = shutil.rmtree
388
389
 
389
390
MIN_ABS_PATHLENGTH = 1
390
391