Merge pull request #1271 from maitbayev/master

Fixes unicode bug in EmbeddedDocumentListField
MongoEngine · Apr 17, 2016 · 43d48b3 · 43d48b3
2 parents 2e406d2 + 1092023
commit 43d48b3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/mongoengine/base/datastructures.py b/mongoengine/base/datastructures.py
@@ -211,7 +211,7 @@ class EmbeddedDocumentList(BaseList):
     def __match_all(cls, i, kwargs):
         items = kwargs.items()
         return all([
-            getattr(i, k) == v or str(getattr(i, k)) == v for k, v in items
+            getattr(i, k) == v or unicode(getattr(i, k)) == v for k, v in items
         ])
 
     @classmethod

diff --git a/tests/fields/fields.py b/tests/fields/fields.py
@@ -4046,6 +4046,17 @@ def test_single_keyword_update(self):
         # modified
         self.assertEqual(number, 2)
 
+    def test_unicode(self):
+        """
+        Tests that unicode strings handled correctly
+        """
+        post = self.BlogPost(comments=[
+            self.Comments(author='user1', message=u'сообщение'),
+            self.Comments(author='user2', message=u'хабарлама')
+        ]).save()
+        self.assertEqual(post.comments.get(message=u'сообщение').author,
+                         'user1')
+
     def test_save(self):
         """
         Tests the save method of a List of Embedded Documents.