[Python-checkins] r86606 - in python/branches/release31-maint: Lib/distutils/dir_util.py Lib/distutils/tests/test_sysconfig.py Misc/NEWS
eric.araujo
python-checkins at python.org
Sat Nov 20 20:45:33 CET 2010
Author: eric.araujo
Date: Sat Nov 20 20:45:32 2010
New Revision: 86606
Log:
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
........
Modified:
python/branches/release31-maint/ (props changed)
python/branches/release31-maint/Lib/distutils/dir_util.py
python/branches/release31-maint/Lib/distutils/tests/test_sysconfig.py
python/branches/release31-maint/Misc/NEWS
Modified: python/branches/release31-maint/Lib/distutils/dir_util.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/dir_util.py (original)
+++ python/branches/release31-maint/Lib/distutils/dir_util.py Sat Nov 20 20:45:32 2010
@@ -5,6 +5,7 @@
__revision__ = "$Id$"
import os, sys
+import errno
from distutils.errors import DistutilsFileError, DistutilsInternalError
from distutils import log
Modified: python/branches/release31-maint/Lib/distutils/tests/test_sysconfig.py
==============================================================================
--- python/branches/release31-maint/Lib/distutils/tests/test_sysconfig.py (original)
+++ python/branches/release31-maint/Lib/distutils/tests/test_sysconfig.py Sat Nov 20 20:45:32 2010
@@ -1,5 +1,6 @@
"""Tests for distutils.sysconfig."""
import os
+import shutil
import test
import unittest
Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS (original)
+++ python/branches/release31-maint/Misc/NEWS Sat Nov 20 20:45:32 2010
@@ -16,6 +16,8 @@
Library
-------
+- Issue #10407: Fix two NameErrors in distutils.
+
- Issue #10198: fix duplicate header written to wave files when writeframes()
is called without data.
More information about the Python-checkins
mailing list