[Python-checkins] cpython (merge default -> default): Upstream merge.

[barry.warsaw]

http://hg.python.org/cpython/rev/331fe5c561d2
changeset:   71431:331fe5c561d2
parent:      71430:9986fff720a2
parent:      71427:c1d2b6b337c5
user:        Barry Warsaw <barry at python.org>
date:        Tue Jul 19 19:25:25 2011 -0400
summary:
  Upstream merge.

files:
  Lib/plat-linux2/CDROM.py                                           |  Bin 
  Lib/plat-linux2/DLFCN.py                                           |  Bin 
  Lib/plat-linux2/IN.py                                              |  Bin 
  Lib/plat-linux2/TYPES.py                                           |  Bin 
  Lib/plat-linux2/regen                                              |  Bin 
  Lib/test/test_tokenize.py                                          |    2 +-
  Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt |    2 +-
  Misc/ACKS                                                          |    1 +
  Misc/NEWS                                                          |    7 +++++++
  9 files changed, 10 insertions(+), 2 deletions(-)


diff --git a/Lib/plat-linux2/CDROM.py b/Lib/plat-linux3/CDROM.py
copy from Lib/plat-linux2/CDROM.py
copy to Lib/plat-linux3/CDROM.py
diff --git a/Lib/plat-linux2/DLFCN.py b/Lib/plat-linux3/DLFCN.py
copy from Lib/plat-linux2/DLFCN.py
copy to Lib/plat-linux3/DLFCN.py
diff --git a/Lib/plat-linux2/IN.py b/Lib/plat-linux3/IN.py
copy from Lib/plat-linux2/IN.py
copy to Lib/plat-linux3/IN.py
diff --git a/Lib/plat-linux2/TYPES.py b/Lib/plat-linux3/TYPES.py
copy from Lib/plat-linux2/TYPES.py
copy to Lib/plat-linux3/TYPES.py
diff --git a/Lib/plat-linux2/regen b/Lib/plat-linux3/regen
copy from Lib/plat-linux2/regen
copy to Lib/plat-linux3/regen
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -649,7 +649,7 @@
         return roundtrip(open(path, 'rb'))
 
     def test_utf8_coding_cookie_and_no_utf8_bom(self):
-        f = 'tokenize_tests-utf8-coding-cookie-and-utf8-bom-sig.txt'
+        f = 'tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt'
         self.assertTrue(self._testFile(f))
 
     def test_latin1_coding_cookie_and_utf8_bom(self):
diff --git a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
--- a/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
+++ b/Lib/test/tokenize_tests-utf8-coding-cookie-and-no-utf8-bom-sig.txt
@@ -1,4 +1,4 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 # IMPORTANT: unlike the other test_tokenize-*.txt files, this file
 # does NOT have the utf-8 BOM signature '\xef\xbb\xbf' at the start
 # of it.  Make sure this is not added inadvertently by your editor
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -1030,6 +1030,7 @@
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Robert Xiao
 Florent Xicluna
 Hirokazu Yamamoto
 Ka-Ping Yee
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -234,6 +234,10 @@
 Library
 -------
 
+- Issue #12571: Add a plat-linux3 directory mirroring the plat-linux2
+  directory, so that "import DLFCN" and other similar imports work on
+  Linux 3.0.
+
 - Issue #7484: smtplib no longer puts <> around addresses in VRFY and EXPN
   commands; they aren't required and in fact postfix doesn't support that form.
 
@@ -1058,6 +1062,9 @@
 Tests
 -----
 
+- Issue #12587: Correct faulty test file and reference in test_tokenize.
+  (Patch by Robert Xiao)
+
 - Issue #12573: Add resource checks for dangling Thread and Process objects.
 
 - Issue #12549: Correct test_platform to not fail when OS X returns 'x86_64'

-- 
Repository URL: http://hg.python.org/cpython