summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2015-07-05 15:38:05 (GMT)
committerBenjamin Peterson <benjamin@python.org>2015-07-05 15:38:05 (GMT)
commit9f71cb0fee510044e7038670b971bf999f3b96d1 (patch)
treea6c1cfcb1daa2a87f640e7e22c2a6e98a291e2f2 /Lib
parent3e7f3c032f68d6be5b8f3501ca7c4124394f3a6c (diff)
parentd5d77aac60453694445d1509b51d7514871dbff8 (diff)
downloadcpython-9f71cb0fee510044e7038670b971bf999f3b96d1.zip
cpython-9f71cb0fee510044e7038670b971bf999f3b96d1.tar.gz
cpython-9f71cb0fee510044e7038670b971bf999f3b96d1.tar.bz2
merge 3.5 (#24569)
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_unpack_ex.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/Lib/test/test_unpack_ex.py b/Lib/test/test_unpack_ex.py
index 01f57b9..d27eef0 100644
--- a/Lib/test/test_unpack_ex.py
+++ b/Lib/test/test_unpack_ex.py
@@ -128,6 +128,9 @@ Dict display element unpacking
... for i in range(1000)) + "}"))
1000
+ >>> {0:1, **{0:2}, 0:3, 0:4}
+ {0: 4}
+
List comprehension element unpacking
>>> a, b, c = [0, 1, 2], 3, 4