If ignore=404 is passed to .get, return None on miss

Fixes #88
elastic · May 11, 2015 · 8ae9227 · 8ae9227
1 parent 40d8c27
commit 8ae9227
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/elasticsearch_dsl/document.py b/elasticsearch_dsl/document.py
@@ -135,6 +135,8 @@ def get(cls, id, using=None, index=None, **kwargs):
             id=id,
             **kwargs
         )
+        if not doc['found']:
+            return None
         return cls.from_es(doc)
 
     @classmethod

diff --git a/test_elasticsearch_dsl/test_integration/test_document.py b/test_elasticsearch_dsl/test_integration/test_document.py
@@ -43,6 +43,9 @@ def test_get_raises_404_on_non_existent_id(data_client):
     with raises(NotFoundError):
         Repository.get('elasticsearch-dsl-php')
 
+def test_get_returns_none_if_404_ignored(data_client):
+    assert None is Repository.get('elasticsearch-dsl-php', ignore=404)
+
 def test_get(data_client):
     elasticsearch_repo = Repository.get('elasticsearch-dsl-py')