From: Éric Araujo <merwok@netwok.org>
Date: Sat, 20 Nov 2010 20:02:41 +0000 (+0000)
Subject: Merged revisions 86601,86605 via svnmerge from
X-Git-Tag: v2.7.1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4fadd53f51b3bd287403de76568c99df39be8a32;p=python

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 d6875936d6..9c5cf337c6 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
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 
diff --git a/Misc/NEWS b/Misc/NEWS
index cc1e5f6163..efd48aaf12 100644
--- 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.