From 66d215c9c148572c4ebd9370453f7406da89abaf Mon Sep 17 00:00:00 2001 From: mostlystatic Date: Sat, 24 Mar 2012 20:01:40 +0000 Subject: [PATCH 1/4] Fix for unknown connection alias error message. --- mongoengine/connection.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mongoengine/connection.py b/mongoengine/connection.py index 3efb7d30..385d7386 100644 --- a/mongoengine/connection.py +++ b/mongoengine/connection.py @@ -86,7 +86,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False): if alias not in _connections: if alias not in _connection_settings: - msg = 'Connection with alias "%s" has not been defined' + msg = 'Connection with alias "%s" has not been defined' % alias if alias == DEFAULT_CONNECTION_NAME: msg = 'You have not defined a default connection' raise ConnectionError(msg) From ad2e11928275fa6bd86d541392a9dbed8c5b9218 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Mon, 26 Mar 2012 16:48:37 -0700 Subject: [PATCH 2/4] The port is defaulted in to conn_settings, so discard the port since hosts_or_uri must be used. --- mongoengine/connection.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mongoengine/connection.py b/mongoengine/connection.py index 3efb7d30..7ecc3de9 100644 --- a/mongoengine/connection.py +++ b/mongoengine/connection.py @@ -110,6 +110,8 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False): 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') connection_class = ReplicaSetConnection try: _connections[alias] = connection_class(**conn_settings) From 98e5daa0e088a006f7699780fb8effd339d55f73 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Tue, 27 Mar 2012 00:49:34 +0100 Subject: [PATCH 3/4] Added mostlystatic to the AUTHORS --- AUTHORS | 3 ++- docs/changelog.rst | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 112b7f36..1c367ffd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -98,4 +98,5 @@ that much better: * Chris Williams * Robert Kajic * Jacob Peddicord - * Nils Hasenbanck \ No newline at end of file + * Nils Hasenbanck + * mostlystatic \ No newline at end of file diff --git a/docs/changelog.rst b/docs/changelog.rst index 0c962cd1..89006713 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -2,6 +2,11 @@ Changelog ========= +Changes in 0.6.X +================ + +- bug fix for unknown connection alias error message + Changes in 0.6.3 ================ - Updated sessions for Django 1.4 From 2a34358abc40ad84a17014e41d9bd8af7c0fd071 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Tue, 27 Mar 2012 01:47:17 +0100 Subject: [PATCH 4/4] 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)