Merge pull request #1 from django-nonrel/master

Merge from upstream

Author: Mark Unsworth

CHANGELOG.rst

@@ -3,6 +3,11 @@ Changelog
 
 .. currentmodule:: djangotoolbox.fields
 
+Version 0.5.2 (TBD)
+-----------------
+* Add support for Replica Sets (Thanks @r4fek)
+
+
 Version 0.5.1 (Nov 2013)
 -----------------
 * Fixed packaging issues

django_mongodb_engine/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python
 # -*- coding: utf-8 -*-
 
-__version__ = (0, 5, 1)
+__version__ = (0, 5, 2)
 __author__ = "Flavio Percoco Premoli, Alberto Paro, " + \
              "Jonas Haag and contributors"
 __contact__ = "[email protected]"

django_mongodb_engine/base.py

@@ -2,14 +2,17 @@
 import datetime
 import decimal
 import sys
+import warnings
 
 from django.conf import settings
 from django.core.exceptions import ImproperlyConfigured
 from django.db.backends.signals import connection_created
 from django.db.utils import DatabaseError
+from pymongo import ReadPreference
 
 from pymongo.collection import Collection
-from pymongo.connection import Connection
+from pymongo.mongo_client import MongoClient
+from pymongo.mongo_replica_set_client import MongoReplicaSetClient
 
 # handle pymongo backward compatibility
 try:
@@ -188,7 +191,7 @@ def __init__(self, *args, **kwargs):
 
     def get_collection(self, name, **kwargs):
         if (kwargs.pop('existing', False) and
-                name not in self.connection.database.collection_names()):
+                name not in self.database.collection_names()):
             return None
         collection = self.collection_class(self.database, name, **kwargs)
         if settings.DEBUG:
@@ -207,9 +210,10 @@ def _connect(self):
 
         def pop(name, default=None):
             return settings.pop(name) or default
+
         db_name = pop('NAME')
         host = pop('HOST')
-        port = pop('PORT')
+        port = pop('PORT', 27017)
         user = pop('USER')
         password = pop('PASSWORD')
         options = pop('OPTIONS', {})
@@ -226,8 +230,35 @@ def pop(name, default=None):
         for key in options.iterkeys():
             options[key.lower()] = options.pop(key)
 
+        read_preference = options.get('read_preference')
+        replicaset = options.get('replicaset')
+
+        if not read_preference:
+            read_preference = options.get('slave_okay', options.get('slaveok'))
+            if read_preference:
+                options['read_preference'] = ReadPreference.SECONDARY
+                warnings.warn("slave_okay has been deprecated. "
+                              "Please use read_preference instead.")
+
+        if replicaset:
+            connection_class = MongoReplicaSetClient
+        else:
+            connection_class = MongoClient
+
+        conn_options = dict(
+            host=host,
+            port=int(port),
+            max_pool_size=None,
+            document_class=dict,
+            tz_aware=False,
+            _connect=True,
+            auto_start_request=True,
+            safe=False
+        )
+        conn_options.update(options)
+
         try:
-            self.connection = Connection(host=host, port=port, **options)
+            self.connection = connection_class(**conn_options)
             self.database = self.connection[db_name]
         except TypeError:
             exc_info = sys.exc_info()

django_mongodb_engine/query.py

@@ -1,7 +1,4 @@
 from warnings import warn
-warn("A() queries are deprecated as of 0.5 and will be removed in 0.6.",
-     DeprecationWarning)
-
 
 from djangotoolbox.fields import RawField, AbstractIterableField, \
     EmbeddedModelField
@@ -16,6 +13,8 @@
 class A(object):
 
     def __init__(self, op, value):
+        warn("A() queries are deprecated as of 0.5 and will be removed in 0.6.", DeprecationWarning) 
+
         self.op = op
         self.val = value
 

docs/source/topics/lists-and-dicts.rst

@@ -26,7 +26,7 @@ Stores Python lists (or any other iterable), represented in BSON as arrays. ::
 ::
 
    >>> Post(tags=['django', 'mongodb'], ...).save()
-   >>> Post.objecs.get(...).tags
+   >>> Post.objects.get(...).tags
    ['django', 'mongodb']
 
 The typed variant automatically does type conversions according to the given type::

tests/mongodb/tests.py

@@ -55,7 +55,7 @@ def test_generic_field(self):
             self.assertEqual(RawModel.objects.get(id=id).raw, obj)
 
     def test_databasewrapper_api(self):
-        from pymongo.connection import Connection
+        from pymongo.mongo_client import MongoClient
         from pymongo.database import Database
         from pymongo.collection import Collection
         from random import shuffle
@@ -70,7 +70,7 @@ def test_databasewrapper_api(self):
                 lambda: self.assertIsInstance(wrapper.get_collection('foo'),
                                               Collection),
                 lambda: self.assertIsInstance(wrapper.database, Database),
-                lambda: self.assertIsInstance(wrapper.connection, Connection),
+                lambda: self.assertIsInstance(wrapper.connection, MongoClient),
             ]
             shuffle(calls)
             for call in calls: