Merge branch 'master' into 0.8

Conflicts: tests/test_document.py
2013-01-09 13:36:17 +00:00
parent 5907dde4a8 06681a453f
commit a68529fba8
3 changed files with 12 additions and 10 deletions
--- a/tests/document/inheritance.py
+++ b/tests/document/inheritance.py
@@ -161,8 +161,8 @@ class InheritanceTest(unittest.TestCase):
        class Employee(Person):
            salary = IntField()

-        self.assertEqual(['salary', 'age', 'name', 'id'],
-                         Employee._fields.keys())
+        self.assertEqual(['age', 'id', 'name', 'salary'],
+                         sorted(Employee._fields.keys()))
        self.assertEqual(Employee._get_collection_name(),
                         Person._get_collection_name())