From 734d081ce6fdd970a96e43c139626519eb6125b8 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Sat, 11 Aug 2012 22:15:29 -0400 Subject: [PATCH] - more fixes to py 3.3 tests, [ticket:2542] --- lib/sqlalchemy/orm/mapper.py | 2 +- test/orm/test_eager_relations.py | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py index a1d3d69548..069de25972 100644 --- a/lib/sqlalchemy/orm/mapper.py +++ b/lib/sqlalchemy/orm/mapper.py @@ -1570,7 +1570,7 @@ class Mapper(_InspectionAttr): def _filter_properties(self, type_): if _new_mappers: configure_mappers() - return util.ImmutableProperties(dict( + return util.ImmutableProperties(util.OrderedDict( (k, v) for k, v in self._props.iteritems() if isinstance(v, type_) )) diff --git a/test/orm/test_eager_relations.py b/test/orm/test_eager_relations.py index 7ec51c6e99..6012349a9f 100644 --- a/test/orm/test_eager_relations.py +++ b/test/orm/test_eager_relations.py @@ -798,10 +798,10 @@ class EagerTest(_fixtures.FixtureTest, testing.AssertsCompiledSQL): mapper(User, users, properties=odict( orders=relationship(Order, backref='user') )) - mapper(Order, orders, properties=odict( - items=relationship(Item, secondary=order_items, backref='orders'), - address=relationship(Address) - )) + mapper(Order, orders, properties=odict([ + ('items', relationship(Item, secondary=order_items, backref='orders')), + ('address', relationship(Address)) + ])) mapper(Address, addresses) mapper(Item, items) -- 2.47.3