From: Raymond Hettinger <python@rcn.com>
Date: Wed, 21 Mar 2007 20:36:45 +0000 (+0000)
Subject: Test and fix fromkeys optional argument.
X-Git-Tag: v2.5.1c1~24
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ed0a6583188e3fdfd8912f05a5219771c419cf1;p=thirdparty%2FPython%2Fcpython.git

Test and fix fromkeys optional argument.
---

diff --git a/Lib/test/test_set.py b/Lib/test/test_set.py
index b46cac4a44b4..ef7cea7be111 100644
--- a/Lib/test/test_set.py
+++ b/Lib/test/test_set.py
@@ -293,6 +293,9 @@ class TestJointOps(unittest.TestCase):
         self.assertEqual(sum(elem.hash_count for elem in d), n)
         d3 = dict.fromkeys(frozenset(d))
         self.assertEqual(sum(elem.hash_count for elem in d), n)
+        d3 = dict.fromkeys(frozenset(d), 123)
+        self.assertEqual(sum(elem.hash_count for elem in d), n)
+        self.assertEqual(d3, dict.fromkeys(d, 123))
 
 class TestSet(TestJointOps):
     thetype = set
diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index acf5ae315941..bc3cd53ebeab 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -1186,8 +1186,8 @@ dict_fromkeys(PyObject *cls, PyObject *args)
 
 		while (_PySet_NextEntry(seq, &pos, &key, &hash)) {
 			Py_INCREF(key);
-			Py_INCREF(Py_None);
-			if (insertdict(mp, key, hash, Py_None))
+			Py_INCREF(value);
+			if (insertdict(mp, key, hash, value))
 				return NULL;
 		}
 		return d;