]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
- more fixes to py 3.3 tests, [ticket:2542]
authorMike Bayer <mike_mp@zzzcomputing.com>
Sun, 12 Aug 2012 02:15:29 +0000 (22:15 -0400)
committerMike Bayer <mike_mp@zzzcomputing.com>
Sun, 12 Aug 2012 02:15:29 +0000 (22:15 -0400)
lib/sqlalchemy/orm/mapper.py
test/orm/test_eager_relations.py

index a1d3d6954834f9e411b97bfe76d9b0167f792e11..069de259726ff5d383ab8da62b79417f17a846ca 100644 (file)
@@ -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_)
         ))
index 7ec51c6e996eb0a6a29f87ec9b962217d660b8ae..6012349a9f4b07247e6f60b36d0d996c6a9c641b 100644 (file)
@@ -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)