From febb3d7e3d5c261b53a14a7704c63d2d839cecc5 Mon Sep 17 00:00:00 2001 From: Ross Lawley Date: Fri, 9 Dec 2011 08:39:50 -0800 Subject: [PATCH] Updated connection - so handles < pymongo 2.1 Updated docs Refs #378 --- docs/changelog.rst | 1 + mongoengine/connection.py | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index 7c9055da..04471186 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -5,6 +5,7 @@ Changelog Changes in dev ============== +- Added pymongo 2.1 support - Fixed Abstract documents can now declare indexes - Added db_alias support to individual documents - Fixed GridFS documents can now be pickled diff --git a/mongoengine/connection.py b/mongoengine/connection.py index 1284e69a..8dbe7182 100644 --- a/mongoengine/connection.py +++ b/mongoengine/connection.py @@ -1,4 +1,4 @@ -from pymongo import Connection, version_tuple +from pymongo import Connection, version __all__ = ['ConnectionError', 'connect', 'register_connection', @@ -73,6 +73,7 @@ def get_connection(alias=DEFAULT_CONNECTION_NAME, reconnect=False): raise ConnectionError(msg) conn_settings = _connection_settings[alias].copy() + version_tuple = [int(v) for v in version.split('.')] if version_tuple[0] >= 2 and version_tuple [1] > 0: conn_settings.pop('name') conn_settings.pop('slaves')