]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Issue #21906: Merge from 3.4.
authorBerker Peksag <berker.peksag@gmail.com>
Fri, 11 Jul 2014 17:44:39 +0000 (20:44 +0300)
committerBerker Peksag <berker.peksag@gmail.com>
Fri, 11 Jul 2014 17:44:39 +0000 (20:44 +0300)
1  2 
Lib/test/test_tools.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
index 2d093366a67b720e0c355bc52ecc67616c4cc79f,cfc03880658e6f00723ff19f1cd110ffc427c2c2..6d790ad9345a9efa006ba28f6a857f8f792a717a
+++ 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.