Skip to content

Commit 7cc964c

Browse files
committed
Add missing import
1 parent bc77322 commit 7cc964c

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

mongoengine/context_managers.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from contextlib import contextmanager
22

33
from pymongo.write_concern import WriteConcern
4+
from pymongo.read_concern import ReadConcern
45
from six import iteritems
56

67
from mongoengine.common import _import_class
@@ -263,10 +264,14 @@ def set_write_concern(collection, write_concerns):
263264
@contextmanager
264265
def set_read_write_concern(collection, write_concerns, read_concerns):
265266
combined_write_concerns = dict(collection.write_concern.document.items())
266-
combined_write_concerns.update(write_concerns)
267+
268+
if write_concerns is not None:
269+
combined_write_concerns.update(write_concerns)
267270

268271
combined_read_concerns = dict(collection.read_concern.document.items())
269-
combined_read_concerns.update(read_concerns)
272+
273+
if read_concerns is not None:
274+
combined_read_concerns.update(read_concerns)
270275

271276
yield collection.with_options(
272277
write_concern=WriteConcern(**combined_write_concerns),

0 commit comments

Comments
 (0)