Enable universal newlines on Windows. Note that NEWS needs more words!

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 849d83b4d77a12b23fcb19c00bb6e89799f532a7..ffbf25114a1660b8651ed776217d9fca3bc700a1 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -511,7 +511,6 @@ _expectations = {
         test_socketserver
         test_sunaudiodev
         test_timing
-        test_univnewlines
         """,
     'linux2':
         """

diff --git a/Misc/NEWS b/Misc/NEWS
index bbaf2d97dd405c346c663cedf0abb8d082a63989..141cba8da8cf76f284978a78906fa220da89588a 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -142,6 +142,9 @@ Tools/Demos
 
 Build
 
+- XXX WITH_UNIVERSAL_NEWLINES Somebody fill this in; the PEP doesn't
+  say how or when to configure it, or how to turn it off.
+
 - On Unix, a shared libpython2.3.so can be created with --enable-shared.
 
 - All uses of the CACHE_HASH, INTERN_STRINGS, and DONT_SHARE_SHORT_STRINGS

diff --git a/PC/pyconfig.h b/PC/pyconfig.h
index 852f354e2979f5ff913538fccd441f3835717389..081142f851cb2e816b94b23d00df28bb184c4293 100644 (file)
--- a/PC/pyconfig.h
+++ b/PC/pyconfig.h
@@ -509,6 +509,9 @@ typedef int pid_t;
 /* Use Python's own small-block memory-allocator. */
 #define WITH_PYMALLOC 1
 
+/* Enable \n, \r, \r\n line ends on import; also the 'U' mode flag for open. */
+#define WITH_UNIVERSAL_NEWLINES 1
+
 /* Define if you have clock.  */
 /* #define HAVE_CLOCK */