From: Berker Peksag <berker.peksag@gmail.com>
Date: Fri, 11 Jul 2014 17:44:39 +0000 (+0300)
Subject: Issue #21906: Merge from 3.4.
X-Git-Tag: v3.5.0a1~1294
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6960c1a94bfdc0687595c96c7779bb8e02b6984c;p=thirdparty%2FPython%2Fcpython.git

Issue #21906: Merge from 3.4.
---

6960c1a94bfdc0687595c96c7779bb8e02b6984c
diff --cc Misc/NEWS
index 2d093366a67b,cfc03880658e..6d790ad9345a
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -752,8 -585,6 +752,11 @@@ Test
  Tools/Demos
  -----------
  
++- Issue #21906: Make Tools/scripts/md5sum.py work in Python 3.
++  Patch by Zachary Ware.
++
 +- Issue #21629: Fix Argument Clinic's "--converters" feature.
 +
  - Add support for ``yield from`` to 2to3.
  
  - Add support for the PEP 465 matrix multiplication operator to 2to3.