Merge pull request #1055 from zxhuang/master

comply to pymongo MongoClient constructor host
This commit is contained in:
Omer Katz 2015-08-16 11:52:27 +03:00
commit 4241bde6ea

View File

@ -108,7 +108,6 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
connection_class = MongoClient connection_class = MongoClient
if 'replicaSet' in conn_settings: if 'replicaSet' in conn_settings:
conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
# Discard port since it can't be used on MongoReplicaSetClient # Discard port since it can't be used on MongoReplicaSetClient
conn_settings.pop('port', None) conn_settings.pop('port', None)
# Discard replicaSet if not base string # Discard replicaSet if not base string
@ -116,6 +115,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False):
conn_settings.pop('replicaSet', None) conn_settings.pop('replicaSet', None)
if not IS_PYMONGO_3: if not IS_PYMONGO_3:
connection_class = MongoReplicaSetClient connection_class = MongoReplicaSetClient
conn_settings['hosts_or_uri'] = conn_settings.pop('host', None)
try: try:
connection = None connection = None