From 64561b70807dbe82e8ca82ebde6a60608112440a Mon Sep 17 00:00:00 2001 From: Ilya Skriblovsky Date: Thu, 10 Aug 2017 18:55:46 +0300 Subject: [PATCH] Fixed compatibility with pymongo 3.5.0 (#210) --- txmongo/collection.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/txmongo/collection.py b/txmongo/collection.py index dd0bf71..c1bb4f9 100644 --- a/txmongo/collection.py +++ b/txmongo/collection.py @@ -14,7 +14,6 @@ from pymongo.bulk import _Bulk, _COMMANDS, _merge_command from pymongo.errors import InvalidName, BulkWriteError, InvalidOperation, OperationFailure from pymongo.helpers import _check_write_command_response -from pymongo.operations import _WriteOp from pymongo.message import _OP_MAP, _INSERT from pymongo.results import InsertOneResult, InsertManyResult, UpdateResult, \ DeleteResult, BulkWriteResult @@ -1204,9 +1203,10 @@ def bulk_write(self, requests, ordered=True): blk = _Bulk(self, ordered, bypass_document_validation=False) for request in requests: - if not isinstance(request, _WriteOp): - raise TypeError("{} is not a valid request".format(request)) - request._add_to_bulk(blk) + try: + request._add_to_bulk(blk) + except AttributeError: + raise TypeError("{} is not valid request".format(request)) return self._execute_bulk(blk)