From: Éric Araujo <merwok@netwok.org>
Date: Sat, 20 Nov 2010 19:45:32 +0000 (+0000)
Subject: Merged revisions 86601,86605 via svnmerge from
X-Git-Tag: v3.1.3~44
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bfa17a562a6dec0fb7886757ca76545335a786de;p=thirdparty%2FPython%2Fcpython.git

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 c7c9fccfd79f..5b005f0865e4 100644
--- 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 78bce9461fe5..309be7b8b1ad 100644
--- 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 7794521353a9..efa001865f75 100644
--- 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.