diff --git a/mongoengine/queryset/base.py b/mongoengine/queryset/base.py index 6d3fb41a..9dfb0f19 100644 --- a/mongoengine/queryset/base.py +++ b/mongoengine/queryset/base.py @@ -1577,7 +1577,10 @@ class BaseQuerySet(object): if self._snapshot: msg = "The snapshot option is not anymore available with PyMongo 3+" warnings.warn(msg, DeprecationWarning) - cursor_args = {"no_cursor_timeout": not self._timeout} + + cursor_args = {} + if not self._timeout: + cursor_args["no_cursor_timeout"] = True if self._loaded_fields: cursor_args[fields_name] = self._loaded_fields.as_dict() diff --git a/tests/queryset/test_queryset.py b/tests/queryset/test_queryset.py index a9ecaef5..e7e59905 100644 --- a/tests/queryset/test_queryset.py +++ b/tests/queryset/test_queryset.py @@ -5809,9 +5809,19 @@ class TestQueryset(unittest.TestCase): self.Person.objects.create(name="Baz") self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 3) - newPerson = self.Person.objects.create(name="Foo_1") + self.Person.objects.create(name="Foo_1") self.assertEqual(self.Person.objects.count(with_limit_and_skip=True), 4) + def test_no_cursor_timeout(self): + qs = self.Person.objects() + self.assertEqual(qs._cursor_args, {}) # ensure no regression of #2148 + + qs = self.Person.objects().timeout(True) + self.assertEqual(qs._cursor_args, {}) + + qs = self.Person.objects().timeout(False) + self.assertEqual(qs._cursor_args, {"no_cursor_timeout": True}) + if __name__ == "__main__": unittest.main()