Merged revisions 86601,86605 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86601 | eric.araujo | 2010-11-20 20:35:27 +0100 (sam., 20 nov. 2010) | 2 lines

  Fix two NameErrors in distutils (#10407)
........
  r86605 | eric.araujo | 2010-11-20 20:37:28 +0100 (sam., 20 nov. 2010) | 2 lines

  Add entry for r86601
........

diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index c7c9fccfd79fb049d07df793b43c6d508f7e3ab4..5b005f0865e466cb6921a5f5414809c97d030fb9 100644 (file)
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -5,6 +5,7 @@ Utility functions for manipulating directories and directory trees."""
 __revision__ = "$Id$"
 
 import os, sys
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 

diff --git a/Lib/distutils/tests/test_sysconfig.py b/Lib/distutils/tests/test_sysconfig.py
index 78bce9461fe5c399e5f2027bf83966f555d0ab44..309be7b8b1ad2e1ba9461f8d33c8fea29f859a50 100644 (file)
--- a/Lib/distutils/tests/test_sysconfig.py
+++ b/Lib/distutils/tests/test_sysconfig.py
@@ -1,5 +1,6 @@
 """Tests for distutils.sysconfig."""
 import os
+import shutil
 import test
 import unittest
 

diff --git a/Misc/NEWS b/Misc/NEWS
index 7794521353a902faeab343248838929c4069155c..efa001865f7584b18347201c1b07e60871f8f286 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -16,6 +16,8 @@ Core and Builtins
 Library
 -------
 
+- Issue #10407: Fix two NameErrors in distutils.
+
 - Issue #10198: fix duplicate header written to wave files when writeframes()
   is called without data.