summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2010-11-20 20:02:41 +0000
committerÉric Araujo <merwok@netwok.org>2010-11-20 20:02:41 +0000
commit4fadd53f51b3bd287403de76568c99df39be8a32 (patch)
treebd8b03a4c3484884e6eaad7d5d8761c634b09b82
parente8803e75244efca68d0843002f27209383837fed (diff)
downloadcpython-git-4fadd53f51b3bd287403de76568c99df39be8a32.tar.gz
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 ........
-rw-r--r--Lib/distutils/dir_util.py1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
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.