[Python-checkins] cpython (merge 3.2 -> 3.2): Branch merge

Fri Aug 26 16:32:39 CEST 2011

http://hg.python.org/cpython/rev/2a81834de3d1
changeset: 72084:2a81834de3d1
branch: 3.2
parent: 72081:d8c9078da979
parent: 72074:c0ec01c95a73
user: Éric Araujo <merwok at netwok.org>
date: Fri Aug 26 16:30:22 2011 +0200
summary:
 Branch merge
files:
 Lib/distutils/tests/support.py | 4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -54,9 +54,13 @@
 
 def setUp(self):
 super().setUp()
+ self.old_cwd = os.getcwd()
 self.tempdirs = []
 
 def tearDown(self):
+ # Restore working dir, for Solaris and derivatives, where rmdir()
+ # on the current directory fails.
+ os.chdir(self.old_cwd)
 super().tearDown()
 while self.tempdirs:
 d = self.tempdirs.pop()
-- 
Repository URL: http://hg.python.org/cpython
