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

Allow arbitary kwargs to be passed to pymongo

Browse Source 
Fix pymongo 2.1+ check
Closes #390 closes #378
This commit is contained in:
Ross Lawley
2011-12-12 09:14:50 +00:00
parent febb3d7e3d
commit 9b3899476c
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mongoengine/connection.py
View File

@@ -1,4 +1,5 @@
from pymongo import Connection, version import pymongo
from pymongo import Connection
__all__ = ['ConnectionError', 'connect', 'register_connection', __all__ = ['ConnectionError', 'connect', 'register_connection',
@@ -19,7 +20,7 @@ _dbs = {}
def register_connection(alias, name, host='localhost', port=27017, def register_connection(alias, name, host='localhost', port=27017,
is_slave=False, read_preference=False, slaves=None, is_slave=False, read_preference=False, slaves=None,
username=None, password=None): username=None, password=None, **kwargs):
"""Add a connection. """Add a connection.
:param alias: the name that will be used to refer to this connection :param alias: the name that will be used to refer to this connection
@@ -33,6 +34,7 @@ def register_connection(alias, name, host='localhost', port=27017,
be a registered connection that has :attr:`is_slave` set to ``True`` be a registered connection that has :attr:`is_slave` set to ``True``
:param username: username to authenticate with :param username: username to authenticate with
:param password: password to authenticate with :param password: password to authenticate with
:param kwargs: allow ad-hoc parameters to be passed into the pymongo driver
""" """
global _connection_settings global _connection_settings
@@ -46,7 +48,7 @@ def register_connection(alias, name, host='localhost', port=27017,
'password': password, 'password': password,
'read_preference': read_preference 'read_preference': read_preference
} }
_connection_settings[alias].update(kwargs)
def disconnect(alias=DEFAULT_CONNECTION_NAME): def disconnect(alias=DEFAULT_CONNECTION_NAME):
global _connections global _connections
@@ -73,8 +75,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
raise ConnectionError(msg) raise ConnectionError(msg)
conn_settings = _connection_settings[alias].copy() conn_settings = _connection_settings[alias].copy()
version_tuple = [int(v) for v in version.split('.')] if hasattr(pymongo, 'version_tuple'): # Support for 2.1+
if version_tuple[0] >= 2 and version_tuple [1] > 0:
conn_settings.pop('name') conn_settings.pop('name')
conn_settings.pop('slaves') conn_settings.pop('slaves')
conn_settings.pop('is_slave') conn_settings.pop('is_slave')