From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 12 Aug 2012 02:15:29 +0000 (-0400)
Subject: - more fixes to py 3.3 tests, [ticket:2542]
X-Git-Tag: rel_0_8_0b1~261
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=734d081ce6fdd970a96e43c139626519eb6125b8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- more fixes to py 3.3 tests, [ticket:2542]
---

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)