Commits

Mike Bayer committed 79edd6e

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

Comments (0)

Files changed (2)

lib/sqlalchemy/orm/mapper.py

     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_)
         ))

test/orm/test_eager_relations.py

         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)