Merge pull request #214 from knowsis/feature/pymongo_3

Support for pymongo 3

Author: aburgel

.gitignore

@@ -12,3 +12,7 @@ dist/
 .tox
 
 MANIFEST
+
+
+.env
+.idea

.travis.yml

@@ -12,18 +12,28 @@ python:
   - 2.7
 
 env:
-  - DJANGO_VERSION=1.4
-  - DJANGO_VERSION=1.5
-  - DJANGO_VERSION=1.6
+  - DJANGO_VERSION=1.4 PYMONGO_VERSION=2.8.1
+  - DJANGO_VERSION=1.4 PYMONGO_VERSION=3.0.2
+  - DJANGO_VERSION=1.5 PYMONGO_VERSION=2.8.1
+  - DJANGO_VERSION=1.5 PYMONGO_VERSION=3.0.2
+  - DJANGO_VERSION=1.6 PYMONGO_VERSION=2.8.1
+  - DJANGO_VERSION=1.6 PYMONGO_VERSION=3.0.2
+  - DJANGO_VERSION=1.7 PYMONGO_VERSION=2.8.1
+  - DJANGO_VERSION=1.7 PYMONGO_VERSION=3.0.2
+
 
 matrix:
   allow_failures:
-    - env: DJANGO_VERSION=1.4
+    - env: DJANGO_VERSION=1.4 PYMONGO_VERSION=2.8.1
+    - env: DJANGO_VERSION=1.4 PYMONGO_VERSION=3.0.2
+    - env: DJANGO_VERSION=1.7 PYMONGO_VERSION=2.8.1
+    - env: DJANGO_VERSION=1.7 PYMONGO_VERSION=3.0.2
 
 install:
   - pip install git+http://github.com/django-nonrel/django@nonrel-$DJANGO_VERSION
   - pip install git+http://github.com/django-nonrel/django-dbindexer@master
   - pip install git+http://github.com/django-nonrel/djangotoolbox@master
+  - pip install pymongo==$PYMONGO_VERSION --upgrade
   - python setup.py install
 
 script: cd tests && python runtests.py

AUTHORS.rst

@@ -23,4 +23,4 @@ Contributions by
 * Brandon Pedersen (https://github.com/bpedman)
 
 (For an up-to-date list of contributors, see
-https://github.com/django-mongodb-engine/mongodb-engine/contributors.)
+https://github.com/django-nonrel/mongodb-engine/contributors.)

django_mongodb_engine/base.py

@@ -39,6 +39,8 @@ class DatabaseFeatures(NonrelDatabaseFeatures):
     supports_microsecond_precision = False
     supports_long_model_names = False
 
+    can_rollback_ddl = True
+
 
 class DatabaseOperations(NonrelDatabaseOperations):
     compiler_module = __name__.rsplit('.', 1)[0] + '.compiler'
@@ -60,6 +62,9 @@ def sql_flush(self, style, tables, sequence_list, allow_cascade=False):
         drop all `tables`. No SQL in MongoDB, so just clear all tables
         here and return an empty list.
         """
+
+
+
         for table in tables:
             if table.startswith('system.'):
                 # Do not try to drop system collections.
@@ -246,11 +251,6 @@ def pop(name, default=None):
                 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),
@@ -259,6 +259,11 @@ def pop(name, default=None):
         )
         conn_options.update(options)
 
+        if replicaset:
+            connection_class = MongoReplicaSetClient
+        else:
+            connection_class = MongoClient
+
         try:
             self.connection = connection_class(**conn_options)
             self.database = self.connection[db_name]

django_mongodb_engine/compiler.py

@@ -136,7 +136,7 @@ def get_cursor(self):
             return []
 
         fields = get_selected_fields(self.query)
-        cursor = self.collection.find(self.mongo_query, fields=fields)
+        cursor = self.collection.find(self.mongo_query, fields)
         if self.ordering:
             cursor.sort(self.ordering)
         if self.query.low_mark > 0:

django_mongodb_engine/utils.py

@@ -70,8 +70,6 @@ def log(self, op, duration, args, kwargs=None):
         logger.debug(msg, extra={'duration': duration})
 
     def find(self, *args, **kwargs):
-        if not 'slave_okay' in kwargs and self.collection.slave_okay:
-            kwargs['slave_okay'] = True
         return DebugCursor(self, self.collection, *args, **kwargs)
 
     def logging_wrapper(method):

docs/source/reference/settings.rst

@@ -3,9 +3,9 @@ Settings
 
 .. TODO fix highlighting
 
-Connection Settings
+Client Settings
 -------------------
-Additional flags may be passed to :class:`pymongo.Connection` using the
+Additional flags may be passed to :class:`pymongo.MongoClient` using the
 ``OPTIONS`` dictionary::
 
    DATABASES = {
@@ -14,27 +14,25 @@ Additional flags may be passed to :class:`pymongo.Connection` using the
            'NAME' : 'my_database',
            ...
            'OPTIONS' : {
-               'slave_okay' : True,
-               'tz_aware' : True,
-               'network_timeout' : 42,
+               'socketTimeoutMS' : 500,
                ...
            }
        }
    }
 
 All of these settings directly mirror PyMongo settings.  In fact, all Django
 MongoDB Engine does is lower-casing the names before passing the flags to
-:class:`~pymongo.Connection`.  For a list of possible options head over to the
-`PyMongo documentation on connection options`_.
+:class:`~pymongo.MongoClient`.  For a list of possible options head over to the
+`PyMongo documentation on client options`_.
 
 .. _operations-setting:
 
-Safe Operations (``getLastError``)
-----------------------------------
+Acknowledged Operations
+-----------------------
 Use the ``OPERATIONS`` dict to specify extra flags passed to
 :meth:`Collection.save <pymongo.collection.Collection.save>`,
 :meth:`~pymongo.collection.Collection.update` or
-:meth:`~pymongo.collection.Collection.remove` (and thus to ``getLastError``):
+:meth:`~pymongo.collection.Collection.remove` (and thus included in the write concern):
 
 .. code-block:: python
 
@@ -43,21 +41,17 @@ Use the ``OPERATIONS`` dict to specify extra flags passed to
        ...
    }
 
-Since any options to ``getLastError`` imply ``safe=True``,
-this configuration passes ``safe=True, w=3`` as keyword arguments to each of
-:meth:`~pymongo.collection.Collection.save`,
-:meth:`~pymongo.collection.Collection.update` and
-:meth:`~pymongo.collection.Collection.remove`.
+
 
 Get a more fine-grained setup by introducing another layer to this dict:
 
 .. code-block:: python
 
    'OPTIONS' : {
        'OPERATIONS' : {
-           'save' : {'safe' : True},
+           'save' : {'w' : 3},
            'update' : {},
-           'delete' : {'fsync' : True}
+           'delete' : {'j' : True}
        },
        ...
    }
@@ -69,10 +63,10 @@ Get a more fine-grained setup by introducing another layer to this dict:
    "`insert vs. update`" into `save`.
 
 
-A full list of ``getLastError`` flags may be found in the
-`MongoDB documentation <http://www.mongodb.org/display/DOCS/getLastError+Command>`_.
+A full list of write concern flags may be found in the
+`MongoDB documentation <http://docs.mongodb.org/manual/core/write-concern/>`_.
 
 .. _Similar to Django's built-in backends: 
    http://docs.djangoproject.com/en/dev/ref/settings/#std:setting-OPTIONS
-.. _PyMongo documentation on connection options: 
-   http://api.mongodb.org/python/current/api/pymongo/connection.html
+.. _PyMongo documentation on client options:
+   http://api.mongodb.org/python/current/api/pymongo/mongo_client.html

requirements.txt

@@ -1,4 +1,6 @@
-pymongo<3.0
+
+pymongo>=2.8
+
 https://github.com/django-nonrel/djangotoolbox/tarball/master
 https://github.com/django-nonrel/django/tarball/nonrel-1.5
 https://github.com/django-nonrel/django-dbindexer/tarball/master

setup.py

@@ -17,7 +17,9 @@
     license='2-clause BSD',
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
-    install_requires=['pymongo<3.0', 'djangotoolbox>=1.6.0'],
+
+    install_requires=['pymongo>=2.8', 'djangotoolbox>=1.6.0'],
+
     packages=find_packages(exclude=['tests', 'tests.*']),
     zip_safe=False,
     classifiers=[

tests/contrib/tests.py

@@ -121,7 +121,6 @@ def test_map_reduce_with_custom_primary_key(self, inline=False):
 class RawQueryTests(TestCase):
 
     def setUp(self):
-        MapReduceModel.objects.all().delete()
 
         for i in xrange(10):
             MapReduceModel.objects.create(n=i, m=i * 2)
@@ -158,6 +157,10 @@ def test_raw_update(self):
 # TODO: Line breaks.
 class FullTextTest(TestCase):
 
+    def setUp(self):
+        Post.objects.all().delete()
+
+
     def test_simple_fulltext(self):
         blog = Post(content="simple, full text.... search? test")
         blog.save()

tests/lookup/tests.py

@@ -2,7 +2,6 @@
 from operator import attrgetter
 
 from django.core.exceptions import FieldError
-from django.db import connection
 from django.db.utils import DatabaseError
 from django.test import TestCase, skipUnlessDBFeature
 
@@ -18,10 +17,6 @@
 class LookupTests(TestCase):
 
     def setUp(self):
-        # Create a few Authors.
-        Author.objects.all().delete()
-        Article.objects.all().delete()
-        Tag.objects.all().delete()
 
         self.au1 = Author(name='Author 1')
         self.au1.save()