Revert "PYTHON-830 - Fix bad uses of _get_wc_override."

This reverts commit 19753f3897.
This commit is contained in:
Bernie Hackett 2015-01-23 18:18:07 -08:00
parent 19753f3897
commit 4acb891473

View File

@ -780,7 +780,7 @@ class Database(common.BaseObject):
opts["pwd"] = auth._password_digest(name, password)
opts["digestPassword"] = False
opts["writeConcern"] = self._get_wc_override() or self.write_concern
opts["writeConcern"] = self._get_wc_override()
opts.update(kwargs)
if create:
@ -890,10 +890,9 @@ class Database(common.BaseObject):
"""
try:
write_concern = self._get_wc_override() or self.write_concern
self.command("dropUser", name,
read_preference=ReadPreference.PRIMARY,
writeConcern=write_concern)
writeConcern=self._get_wc_override())
except OperationFailure, exc:
# See comment in add_user try / except above.
if exc.code in common.COMMAND_NOT_FOUND_CODES: