From f1fcc92e36a1ec43afcfd7750f4f4753f4ef6b00 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 17 Dec 2015 11:24:35 -0500 Subject: - Further fixes to :ticket:`3605`, pop method on :class:`.MutableDict`, where the "default" argument was not included. fixes #3605 (cherry picked from commit 913858c949ae9ca6250217d82d72c7d79e9f6585) --- test/ext/test_mutable.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'test/ext') diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py index ed97a0d92..602ff911a 100644 --- a/test/ext/test_mutable.py +++ b/test/ext/test_mutable.py @@ -4,7 +4,7 @@ from sqlalchemy.orm import mapper, Session, composite from sqlalchemy.orm.mapper import Mapper from sqlalchemy.orm.instrumentation import ClassManager from sqlalchemy.testing.schema import Table, Column -from sqlalchemy.testing import eq_, assert_raises_message +from sqlalchemy.testing import eq_, assert_raises_message, assert_raises from sqlalchemy.testing.util import picklers from sqlalchemy.testing import fixtures from sqlalchemy.ext.mutable import MutableComposite @@ -146,6 +146,21 @@ class _MutableDictTestBase(_MutableDictTestFixture): eq_(f1.data.pop('a'), 'b') sess.commit() + assert_raises(KeyError, f1.data.pop, 'g') + + eq_(f1.data, {'c': 'd'}) + + def test_pop_default(self): + sess = Session() + + f1 = Foo(data={'a': 'b', 'c': 'd'}) + sess.add(f1) + sess.commit() + + eq_(f1.data.pop('a', 'q'), 'b') + eq_(f1.data.pop('a', 'q'), 'q') + sess.commit() + eq_(f1.data, {'c': 'd'}) def test_popitem(self): -- cgit v1.2.1