Merged revisions 86601,86605 via svnmerge from

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

In 2.7, there was only one NameError.

........
  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 d6875936d62346d9d88b44ca181b5e4e3fac34a3..9c5cf337c6c9ab87fa693e3d754b584573424a8d 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
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 

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