From 98922562cfe549efdc94f1b18fbe901b10f78fcd Mon Sep 17 00:00:00 2001
From: "A. Jesse Jiryu Davis" <jesse@mongodb.com>
Date: Wed, 18 Mar 2015 14:28:01 -0400
Subject: [PATCH] PYTHON-857 - Simplify _Bulk.execute_no_results.

---
 pymongo/bulk.py | 41 ++++++++++++++++++-----------------------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/pymongo/bulk.py b/pymongo/bulk.py
index ef727d887..9c4c207b0 100644
--- a/pymongo/bulk.py
+++ b/pymongo/bulk.py
@@ -307,30 +307,25 @@ class _Bulk(object):
                                      run.ops,
                                      self.ordered,
                                      write_concern=write_concern)
+                    elif run.op_type == _UPDATE:
+                        for operation in run.ops:
+                            doc = operation['u']
+                            check_keys = True
+                            if doc and next(iter(doc)).startswith('$'):
+                                check_keys = False
+                            coll._update(sock_info,
+                                         operation['q'],
+                                         doc,
+                                         operation['upsert'],
+                                         check_keys,
+                                         operation['multi'],
+                                         write_concern=write_concern)
                     else:
-                        try:
-                            if run.op_type == _UPDATE:
-                                for operation in run.ops:
-                                    doc = operation['u']
-                                    check_keys = True
-                                    if doc and next(iter(doc)).startswith('$'):
-                                        check_keys = False
-                                    coll._update(sock_info,
-                                                 operation['q'],
-                                                 doc,
-                                                 operation['upsert'],
-                                                 check_keys,
-                                                 operation['multi'],
-                                                 write_concern=write_concern)
-                            else:
-                                for operation in run.ops:
-                                    coll._delete(sock_info,
-                                                 operation['q'],
-                                                 not operation['limit'],
-                                                 write_concern)
-                        except OperationFailure:
-                            if self.ordered:
-                                return
+                        for operation in run.ops:
+                            coll._delete(sock_info,
+                                         operation['q'],
+                                         not operation['limit'],
+                                         write_concern)
             except OperationFailure:
                 if self.ordered:
                     break