Fixed #75 -- Removed deprecated database options.

Author: jonashaag

django_mongodb_engine/base.py

@@ -1,4 +1,5 @@
 import copy
+import sys
 from django.core.exceptions import ImproperlyConfigured
 from django.db.backends.signals import connection_created
 from django.conf import settings
@@ -117,44 +118,31 @@ def pop(name, default=None):
         password = pop('PASSWORD')
         options = pop('OPTIONS', {})
 
-        if port:
-            try:
-                port = int(port)
-            except ValueError:
-                raise ImproperlyConfigured("If set, PORT must be an integer "
-                                           "(got %r instead)" % port)
-
         self.operation_flags = options.pop('OPERATIONS', {})
         if not any(k in ['save', 'delete', 'update'] for k in self.operation_flags):
             # flags apply to all operations
             flags = self.operation_flags
             self.operation_flags = {'save' : flags, 'delete' : flags, 'update' : flags}
 
-        # Compatibility to version < 0.4
-        if 'SAFE_INSERTS' in settings:
-            _warn_deprecated('SAFE_INSERTS')
-            self.operation_flags['save']['safe'] = settings['SAFE_INSERTS']
-        if 'WAIT_FOR_SLAVES' in settings:
-            _warn_deprecated('WAIT_FOR_SLAVES')
-            self.operation_flags['save']['w'] = settings['WAIT_FOR_SLAVES']
-
-        # lower-case all remaining OPTIONS
+        # lower-case all OPTIONS keys
         for key in options.iterkeys():
             options[key.lower()] = options.pop(key)
 
         try:
             self.connection = Connection(host=host, port=port, **options)
             self.database = self.connection[db_name]
         except TypeError:
-            import sys
             exc_info = sys.exc_info()
             raise ImproperlyConfigured, exc_info[1], exc_info[2]
 
         if user and password:
             if not self.database.authenticate(user, password):
                 raise ImproperlyConfigured("Invalid username or password")
 
-        self._add_serializer()
+        if settings.get('MONGODB_AUTOMATIC_REFERENCING'):
+            from .serializer import TransformDjango
+            self.database.add_son_manipulator(TransformDjango())
+
         self.connected = True
         connection_created.send(sender=self.__class__, connection=self)
 
@@ -165,14 +153,6 @@ def _reconnect(self):
             self.connected = False
         self._connect()
 
-    def _add_serializer(self):
-        for option in ['MONGODB_AUTOMATIC_REFERENCING',
-                       'MONGODB_ENGINE_ENABLE_MODEL_SERIALIZATION']:
-            if getattr(settings, option, False):
-                from .serializer import TransformDjango
-                self.database.add_son_manipulator(TransformDjango())
-                return
-
     def _commit(self):
         pass
 

tests/mongodb/tests.py

@@ -49,8 +49,8 @@ def test_lazy_model_instance_in_list(self):
         obj.raw.append(related)
         self.assertRaises(InvalidDocument, obj.save)
 
-        settings.MONGODB_AUTOMATIC_REFERENCING = True
-        connections._connections.values()[0]._add_serializer()
+        connection.settings_dict['MONGODB_AUTOMATIC_REFERENCING'] = True
+        connection._reconnect()
         obj.save()
         self.assertNotEqual(related.id, None)
         obj = RawModel.objects.get(id=obj.id)
@@ -262,12 +262,6 @@ def test_setup(flags, **method_kwargs):
             remove={'fsync' : True}
         )
 
-    def test_legacy_flags(self):
-        options = {'SAFE_INSERTS' : True, 'WAIT_FOR_SLAVES' : 5}
-        with self.custom_database_wrapper(options) as wrapper:
-            self.assertTrue(wrapper.operation_flags['save']['safe'])
-            self.assertEqual(wrapper.operation_flags['save']['w'], 5)
-
     def test_unique(self):
         with self.custom_database_wrapper({'OPTIONS': {}}):
             Post.objects.create(title='a', content='x')