From 2a34358abc40ad84a17014e41d9bd8af7c0fd071 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Tue, 27 Mar 2012 01:47:17 +0100 Subject: [PATCH] Updated connection refs #474 --- docs/changelog.rst | 1 + mongoengine/connection.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 89006713..8674e9ee 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,7 @@ Changelog Changes in 0.6.X ================ +- updated replicasetconnection - pop port if exists - bug fix for unknown connection alias error message Changes in 0.6.3 diff --git a/mongoengine/connection.py b/mongoengine/connection.py index 0b7daa85..9cf8264a 100644 --- a/mongoengine/connection.py +++ b/mongoengine/connection.py @@ -105,13 +105,13 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False): for slave_alias in conn_settings['slaves']: slaves.append(get_connection(slave_alias)) conn_settings['slaves'] = slaves - conn_settings.pop('read_preference') + conn_settings.pop('read_preference', None) connection_class = Connection if 'replicaSet' in conn_settings: conn_settings['hosts_or_uri'] = conn_settings.pop('host', None) # Discard port since it can't be used on ReplicaSetConnection - conn_settings.pop('port') + conn_settings.pop('port', None) connection_class = ReplicaSetConnection try: _connections[alias] = connection_class(**conn_settings)