From 72dd9daa23ea4e9adf44df6a3c3ab2499e971ad6 Mon Sep 17 00:00:00 2001
From: Ross Lawley <ross.lawley@gmail.com>
Date: Wed, 9 Jan 2013 16:16:48 +0000
Subject: [PATCH] Fixing py3.3 tests

---
 mongoengine/queryset/transform.py | 2 +-
 tests/queryset/transform.py       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 8ee84eed..9fe87802 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -26,7 +26,7 @@ def query(_doc_cls=None, _field_operation=False, **query):
     """
     mongo_query = {}
     merge_query = defaultdict(list)
-    for key, value in query.items():
+    for key, value in sorted(query.items()):
         if key == "__raw__":
             mongo_query.update(value)
             continue
diff --git a/tests/queryset/transform.py b/tests/queryset/transform.py
index 666b3451..d38cbfd5 100644
--- a/tests/queryset/transform.py
+++ b/tests/queryset/transform.py
@@ -26,7 +26,7 @@ class TransformTest(unittest.TestCase):
         self.assertEqual(transform.query(age__gt=20, age__lt=50),
                          {'age': {'$gt': 20, '$lt': 50}})
         self.assertEqual(transform.query(age=20, age__gt=50),
-                         {'age': 20})
+                         {'$and': [{'age': {'$gt': 50}}, {'age': 20}]})
         self.assertEqual(transform.query(friend__age__gte=30),
                          {'friend.age': {'$gte': 30}})
         self.assertEqual(transform.query(name__exists=True),