Rev 5295: Merge first-try into propagate-exceptions in file:///home/vila/src/bzr/experimental/leaking-tests/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Jun 30 16:02:23 BST 2010
At file:///home/vila/src/bzr/experimental/leaking-tests/
------------------------------------------------------------
revno: 5295 [merge]
revision-id: v.ladeuil+lp at free.fr-20100630150223-c66kbhyonzxk3gkf
parent: v.ladeuil+lp at free.fr-20100629171354-l144fj5s14kw6jov
parent: v.ladeuil+lp at free.fr-20100630150221-h3pg0la9h29hsan8
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: propagate-exceptions
timestamp: Wed 2010-06-30 17:02:23 +0200
message:
Merge first-try into propagate-exceptions
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
-------------- next part --------------
=== modified file 'bzrlib/osutils.py'
--- a/bzrlib/osutils.py 2010-06-29 17:13:54 +0000
+++ b/bzrlib/osutils.py 2010-06-30 15:02:23 +0000
@@ -28,10 +28,16 @@
import getpass
import ntpath
import posixpath
+# We need to import both shutil and rmtree as we export the later on posix
+# and need the former on windows
+import shutil
from shutil import rmtree
import socket
import subprocess
-import tempfile import mkdtemp
+# We need to import both tempfile and mkdtemp as we export the later on posix
+# and need the former on windows
+import tempfile
+from tempfile import mkdtemp
import unicodedata
from bzrlib import (
@@ -346,7 +352,7 @@
def _win32_mkdtemp(*args, **kwargs):
- return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
+ return _win32_fixdrive(mkdtemp(*args, **kwargs).replace('\\', '/'))
def _win32_rename(old, new):
More information about the bazaar-commits
mailing list