← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/osutils.py

  • Committer: Andrew Bennetts
  • Date: 2008-09-08 13:44:19 UTC
  • mto: This revision was merged to the branch mainline in revision 3756.
  • Revision ID: andrew.bennetts@canonical.com-20080908134419-y8jrlhi4k4fvwaj0
More minor import tidying suggested by pyflakes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/osutils.py
19
19
import stat
20
20
from stat import (S_ISREG, S_ISDIR, S_ISLNK, ST_MODE, ST_SIZE,
21
21
                  S_ISCHR, S_ISBLK, S_ISFIFO, S_ISSOCK)
 
22
import sha
22
23
import sys
23
24
import time
24
25
 
34
35
                    splitdrive as _nt_splitdrive,
35
36
                    )
36
37
import posixpath
37
 
import sha
38
38
import shutil
39
39
from shutil import (
40
40
    rmtree,
55
55
 
56
56
import bzrlib
57
57
from bzrlib import symbol_versioning
58
 
from bzrlib.symbol_versioning import (
59
 
    deprecated_function,
60
 
    )
61
58
 
62
59
 
63
60
# On win32, O_BINARY is used to indicate the file should
201
198
    """
202
199
 
203
200
    # sftp rename doesn't allow overwriting, so play tricks:
204
 
    import random
205
201
    base = os.path.basename(new)
206
202
    dirname = os.path.dirname(new)
207
203
    tmp_name = u'tmp.%s.%.9f.%d.%s' % (base, time.time(), os.getpid(), rand_chars(10))