pub/mongoengine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
Ross Lawley 2012-03-27 01:47:48 +01:00
commit d0e42a4798
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AUTHORS
View File

@ -98,4 +98,5 @@ that much better:
* Chris Williams * Chris Williams
* Robert Kajic * Robert Kajic
* Jacob Peddicord * Jacob Peddicord
* Nils Hasenbanck * Nils Hasenbanck
* mostlystatic

6
docs/changelog.rst
View File

@ -2,6 +2,12 @@
Changelog 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 Changes in 0.6.3
================ ================
- Updated sessions for Django 1.4 - Updated sessions for Django 1.4

6
mongoengine/connection.py
View File

@ -86,7 +86,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
if alias not in _connections: if alias not in _connections:
if alias not in _connection_settings: 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: if alias == DEFAULT_CONNECTION_NAME:
msg = 'You have not defined a default connection' msg = 'You have not defined a default connection'
raise ConnectionError(msg) raise ConnectionError(msg)
@ -105,11 +105,13 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
for slave_alias in conn_settings['slaves']: for slave_alias in conn_settings['slaves']:
slaves.append(get_connection(slave_alias)) slaves.append(get_connection(slave_alias))
conn_settings['slaves'] = slaves conn_settings['slaves'] = slaves
conn_settings.pop('read_preference') conn_settings.pop('read_preference', None)
connection_class = Connection connection_class = Connection
if 'replicaSet' in conn_settings: if 'replicaSet' in conn_settings:
conn_settings['hosts_or_uri'] = conn_settings.pop('host', None) conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
# Discard port since it can't be used on ReplicaSetConnection
conn_settings.pop('port', None)
connection_class = ReplicaSetConnection connection_class = ReplicaSetConnection
try: try:
_connections[alias] = connection_class(**conn_settings) _connections[alias] = connection_class(**conn_settings)