Backport:

Fix SF #1345263, colorsys tests, bug in frange

Fix a typo that caused step to be ignored.

diff --git a/Lib/test/test_colorsys.py b/Lib/test/test_colorsys.py
index 1ef7b0cdfc70bb9fe1719f82dd8e6afdf35832e3..a8cd885db1252d7e202a337dcee8fbbf51c62993 100644 (file)
--- a/Lib/test/test_colorsys.py
+++ b/Lib/test/test_colorsys.py
@@ -4,7 +4,7 @@ import colorsys
 def frange(start, stop, step):
     while start <= stop:
         yield start
-        start += stop
+        start += step
 
 class ColorsysTest(unittest.TestCase):
 

diff --git a/Misc/ACKS b/Misc/ACKS
index 0fdb79f4fe6e458d644f5b0bb0f7d67ca210f3a9..7faa2c0aa5ee4458dd619feeed4e51d11a70f39a 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -268,6 +268,7 @@ Chris Hoffman
 Albert Hofkamp
 Jonathan Hogg
 Gerrit Holl
+Rune Holm
 Philip Homburg
 Naofumi Honda
 Jeffrey Honig