[Python-checkins] r86609 - in python/branches/release27-maint: Lib/distutils/dir_util.py Misc/NEWS

[eric.araujo]

Author: eric.araujo
Date: Sat Nov 20 21:02:41 2010
New Revision: 86609

Log:
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
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/distutils/dir_util.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/release27-maint/Lib/distutils/dir_util.py	(original)
+++ python/branches/release27-maint/Lib/distutils/dir_util.py	Sat Nov 20 21:02:41 2010
@@ -5,6 +5,7 @@
 __revision__ = "$Id$"
 
 import os
+import errno
 from distutils.errors import DistutilsFileError, DistutilsInternalError
 from distutils import log
 

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Sat Nov 20 21:02:41 2010
@@ -13,6 +13,8 @@
 Library
 -------
 
+- Issue #10407: Fix one NameError in distutils.
+
 - Issue #10198: fix duplicate header written to wave files when writeframes()
   is called without data.