Ignore unknown config var starting by MONGODB_ instead of crashing

Author: touilleMan

flask_mongoengine/connection.py

@@ -1,11 +1,16 @@
 import mongoengine
 from pymongo import ReadPreference, uri_parser
 
+
 __all__ = (
  'create_connections', 'get_connection_settings', 'InvalidSettingsError',
 )
 
 
+MONGODB_CONF_VARS = ('MONGODB_ALIAS', 'MONGODB_DB', 'MONGODB_HOST', 'MONGODB_IS_MOCK',
+ 'MONGODB_PASSWORD', 'MONGODB_PORT', 'MONGODB_USERNAME')
+
+
 class InvalidSettingsError(Exception):
  pass
 
@@ -82,10 +87,10 @@ def get_connection_settings(config):
  else:
  return _sanitize_settings(settings)
 
- # If "MONGODB_SETTINGS" doesn't exist, sanitize all the keys starting with
- # "MONGODB_" as if they all describe a single connection.
+ # If "MONGODB_SETTINGS" doesn't exist, sanitize the "MONGODB_" keys
+ # as if they all describe a single connection.
  else:
- config = dict((k, v) for k, v in config.items() if k.startswith('MONGODB_')) # ugly dict comprehention in order to support python 2.6
+ config = dict((k, v) for k, v in config.items() if k in MONGODB_CONF_VARS) # ugly dict comprehention in order to support python 2.6
  return _sanitize_settings(config)
 
 

tests/test_connection.py

@@ -156,6 +156,16 @@ def test_connection_with_invalid_uri(self):
  self.app.config['MONGODB_HOST'] = 'mongo://localhost'
  self.assertRaises(InvalidURI, MongoEngine, self.app)
 
+ def test_ingnored_mongodb_prefix_config(self):
+ """Config starting by MONGODB_ but not used by flask-mongoengine
+ should be ignored.
+ """
+ db = MongoEngine()
+ self.app.config['MONGODB_HOST'] = 'mongodb://localhost:27017/flask_mongoengine_test_db_prod'
+ # Invalid host, should trigger exception if used
+ self.app.config['MONGODB_TEST_HOST'] = 'dummy://localhost:27017/test'
+ self._do_persist(db)
+
  def test_connection_kwargs(self):
  """Make sure additional connection kwargs work."""