Merge lp:~gz/bzr/win32_mkdtemp_infinite_recursion into lp:bzr

[Martin Packman]

Fix regression from r5326 that caused infinite recursion in osutils._win32_mkdtemp

Fixes a regression from r5326 caused by removing `tempfile.` from the start of `mkdtemp` inside a function that is then bound as `mkdtemp` on Windows.

Would like to clean up osutils to avoid craziness like this, and am not actually convinced the lazy import of tempfile is ever a win, but just reverting the one line for now.

This was actually caught by babune, but red is both "tests failed" and "test run aborted" so it wasn't obvious:
http://babune.ladeuil.net:24842/job/selftest-windows/107/

[Robert Collins (lifeless)]

+1

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin [gz] wrote:
> Martin [gz] has proposed merging lp:~gz/bzr/win32_mkdtemp_infinite_recursion into lp:bzr.
>
> Requested reviews:
> bzr-core (bzr-core)
>
>
> Fixes a regression from r5326 caused by removing `tempfile.` from the start of `mkdtemp` inside a function that is then bound as `mkdtemp` on Windows.
>
> Would like to clean up osutils to avoid craziness like this, and am not actually convinced the lazy import of tempfile is ever a win, but just reverting the one line for now.
>
> This was actually caught by babune, but red is both "tests failed" and "test run aborted" so it wasn't obvious:
> http://babune.ladeuil.net:24842/job/selftest-windows/107/
>

 merge: approve

Since the Review queue doesn't actually support "+1" anymore.

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkwwmaIACgkQJdeBCYSNAAM1lgCfdB7c8yeRiVbM3YY08dAPrJ+C
8okAnRPncPLgjfJaIFT7tyf93yfX+wox
=H9/O
-----END PGP SIGNATURE-----

review: Approve

[Robert Collins (lifeless)]

sent to pqm by email

=== modified file 'bzrlib/osutils.py'
--- bzrlib/osutils.py	2010-06-29 17:46:25 +0000
+++ bzrlib/osutils.py	2010-07-04 07:54:28 +0000
@@ -352,7 +352,7 @@
 
 
 def _win32_mkdtemp(*args, **kwargs):
-    return _win32_fixdrive(mkdtemp(*args, **kwargs).replace('\\', '/'))
+    return _win32_fixdrive(tempfile.mkdtemp(*args, **kwargs).replace('\\', '/'))
 
 
 def _win32_rename(old, new):