From a46a2c3f12e670db2870c0e838bc7aaf2387abc0 Mon Sep 17 00:00:00 2001 From: Jean-Marie Ferdegue Date: Fri, 17 Apr 2015 11:25:27 +0100 Subject: [PATCH] Add the ability to remove options that should not be passed when connecting (for more recent version of mongo) --- django_mongodb_engine/base.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/django_mongodb_engine/base.py b/django_mongodb_engine/base.py index 033008e4..c1d71dbf 100644 --- a/django_mongodb_engine/base.py +++ b/django_mongodb_engine/base.py @@ -217,7 +217,8 @@ def pop(name, default=None): user = pop('USER') password = pop('PASSWORD') options = pop('OPTIONS', {}) - + options_removed = pop('OPTIONS_REMOVED', []) + self.operation_flags = options.pop('OPERATIONS', {}) if not any(k in ['save', 'delete', 'update'] for k in self.operation_flags): @@ -256,6 +257,8 @@ def pop(name, default=None): safe=False ) conn_options.update(options) + for k in options_removed: + conn_options.pop(k, None) try: self.connection = connection_class(**conn_options)