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

[eric.araujo]

http://hg.python.org/cpython/rev/f282d9041ac7
changeset:   75439:f282d9041ac7
parent:      75438:449c9fc2fc2d
parent:      75437:4cfcda9e80cb
user:        Éric Araujo <merwok at netwok.org>
date:        Mon Mar 05 17:04:20 2012 +0100
summary:
  Merge 3.2

files:
  Lib/distutils/tests/test_bdist_msi.py |  1 +
  1 files changed, 1 insertions(+), 0 deletions(-)


diff --git a/Lib/distutils/tests/test_bdist_msi.py b/Lib/distutils/tests/test_bdist_msi.py
--- a/Lib/distutils/tests/test_bdist_msi.py
+++ b/Lib/distutils/tests/test_bdist_msi.py
@@ -1,4 +1,5 @@
 """Tests for distutils.command.bdist_msi."""
+import os
 import sys
 import unittest
 from test.support import run_unittest

-- 
Repository URL: http://hg.python.org/cpython