PYTHON-830 - Fix bad uses of _get_wc_override.

behackett · behackett · commit c31baa2dfa27 · 2015-01-23T15:08:22.000-08:00
diff --git a/pymongo/database.py b/pymongo/database.py
@@ -735,7 +735,8 @@ def _create_or_update_user(
             opts["pwd"] = auth._password_digest(name, password)
             opts["digestPassword"] = False
 
-        opts["writeConcern"] = self._get_wc_override()
+        opts["writeConcern"] = (
+            self._get_wc_override() or self.write_concern.document)
         opts.update(kwargs)
 
         if create:
@@ -841,8 +842,10 @@ def remove_user(self, name):
         """
 
         try:
+            write_concern = (
+                self._get_wc_override() or self.write_concern.document)
             self.command("dropUser", name,
-                         writeConcern=self._get_wc_override())
+                         writeConcern=write_concern)
         except OperationFailure as exc:
             # See comment in add_user try / except above.
             if exc.code in common.COMMAND_NOT_FOUND_CODES:
