Don't resolve 'MONGODB_SETTINGS'.

Author: jcass77

flask_mongoengine/connection.py

@@ -254,24 +254,30 @@ def _register_test_connection(port, db_alias, preserved):
  return _conn
 
 
-def _resolve_settings(settings, remove_pass=True):
+def _resolve_settings(settings, settings_prefix=None, remove_pass=True):
 
  if settings and isinstance(settings, dict):
  resolved_settings = dict()
  for k, v in settings.items():
- if k.startswith("MONGODB_"):
- resolved_settings[k[8:].lower()] = v
+ if settings_prefix > 0:
+ # Only resolve parameters that contain the prefix, ignoring the rest.
+ if k.startswith(settings_prefix):
+ resolved_settings[k[len(settings_prefix):].lower()] = v
  else:
+ # If no prefix is provided then we assume that all parameters are relevant for the DB connection string.
  resolved_settings[k.lower()] = v
 
- resolved_settings['alias'] = resolved_settings.get('alias', DEFAULT_CONNECTION_NAME)
+ # Add various default values.
+ resolved_settings['alias'] = resolved_settings.get('alias', DEFAULT_CONNECTION_NAME)
  if (resolved_settings.has_key('db')):
  resolved_settings['name'] = resolved_settings.pop('db')
  else:
  resolved_settings['name'] = 'test'
+
  resolved_settings['host'] = resolved_settings.get('host', 'localhost')
  resolved_settings['port'] = resolved_settings.get('port', 27017)
  resolved_settings['username'] = resolved_settings.get('username', None)
+
  # default to ReadPreference.PRIMARY if no read_preference is supplied
  resolved_settings['read_preference'] = resolved_settings.get('read_preference', ReadPreference.PRIMARY)
  if 'replicaset' in resolved_settings:
@@ -284,6 +290,7 @@ def _resolve_settings(settings, remove_pass=True):
  pass
 
  return resolved_settings
+
  return settings
 
 
@@ -315,14 +322,14 @@ def fetch_connection_settings(config, remove_pass=True):
  # List of connection settings.
  settings_list = []
  for setting in settings:
- settings_list.append(_resolve_settings(setting, remove_pass))
+ settings_list.append(_resolve_settings(setting, remove_pass=remove_pass))
  return settings_list
  else:
  # Connection settings provided as a dictionary.
- return _resolve_settings(settings, remove_pass)
+ return _resolve_settings(settings, remove_pass=remove_pass)
  else:
  # Connection settings provided in standard format.
- return _resolve_settings(config, remove_pass)
+ return _resolve_settings(config, settings_prefix='MONGODB_', remove_pass=remove_pass)
 
 
 def create_connection(config, app):