summaryrefslogtreecommitdiff
path: root/test/orm/test_hasparent.py
diff options
context:
space:
mode:
authorjonathan vanasco <jonathan@2xlp.com>2015-12-16 11:04:25 -0500
committerjonathan vanasco <jonathan@2xlp.com>2015-12-16 11:04:25 -0500
commitce25ac172d3b1be81025b7b541a9aa32b0286974 (patch)
tree7920084df122b2df19a44b2946ab0e52d4fe5958 /test/orm/test_hasparent.py
parent0a5dcdc2c4112478d87e5cd68c187e302f586834 (diff)
parent03ee22f342bbef9b15bfc989edda6a4ac3910508 (diff)
downloadsqlalchemy-ce25ac172d3b1be81025b7b541a9aa32b0286974.tar.gz
Merge branch 'master' of bitbucket.org:zzzeek/sqlalchemy
Diffstat (limited to 'test/orm/test_hasparent.py')
-rw-r--r--test/orm/test_hasparent.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/orm/test_hasparent.py b/test/orm/test_hasparent.py
index fd246b527..df4b05980 100644
--- a/test/orm/test_hasparent.py
+++ b/test/orm/test_hasparent.py
@@ -116,7 +116,7 @@ class ParentRemovalTest(fixtures.MappedTest):
User = self.classes.User
s, u1, a1 = self._fixture()
- s._expunge_state(attributes.instance_state(u1))
+ s._expunge_states([attributes.instance_state(u1)])
del u1
gc_collect()
@@ -178,7 +178,7 @@ class ParentRemovalTest(fixtures.MappedTest):
u2 = User(addresses=[a1])
s.add(u2)
s.flush()
- s._expunge_state(attributes.instance_state(u2))
+ s._expunge_states([attributes.instance_state(u2)])
del u2
gc_collect()