Merge 3.2

merwok · merwok · commit c53d6242359c · 2012-03-05T17:04:20.000+01:00
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Tests for distutils.command.bdist_msi."""`
	`2`	`+import os`
`2`	`3`	`import sys`
`3`	`4`	`import unittest`
`4`	`5`	`from test.support import run_unittest`