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.
diff --git a/Misc/NEWS b/Misc/NEWS
index c740b20..eb55f29 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -1073,6 +1073,9 @@
 
 - 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 @@
 ----
 
 
-**(For information about older versions, consult the HISTORY file.)**
+**(For information about older versions, consult the HISTORY file.)**
\ No newline at end of file