summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2011-07-26 15:57:08 (GMT)
committerJason R. Coombs <jaraco@jaraco.com>2011-07-26 15:57:08 (GMT)
commit1322bd4971b9aee0a4a18ae1c12c6257308b4a52 (patch)
tree8bd8f8404930cc8d07993e490796d041346a35bb /Misc
parent83d21930ab45af7a205a888c897636e2cf053da4 (diff)
parent76748b7033cdd52a95d78d85f2ec15244e5d0fd8 (diff)
downloadcpython-1322bd4971b9aee0a4a18ae1c12c6257308b4a52.zip
cpython-1322bd4971b9aee0a4a18ae1c12c6257308b4a52.tar.gz
cpython-1322bd4971b9aee0a4a18ae1c12c6257308b4a52.tar.bz2
Merge with 3.2 Issue #10639: reindent.py should not convert newlines.
reindent.py now will use the newline detected in the original file and will report an error if mixed newlines are encountered.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS5
1 files changed, 4 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index c740b20..eb55f29 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1073,6 +1073,9 @@ Tools/Demos
- Issue #11179: Make ccbench work under Python 3.1 and 2.7 again.
+- Issue #10639: reindent.py no longer converts newlines and will raise
+ an error if attempting to convert a file with mixed newlines.
+
Extension Modules
-----------------
@@ -6661,4 +6664,4 @@ Docs
----
-**(For information about older versions, consult the HISTORY file.)**
+**(For information about older versions, consult the HISTORY file.)** \ No newline at end of file