Update PyMongo 3.0+ support, remove MongoKit support

Author: sylvinus

mrq/context.py

@@ -2,7 +2,6 @@
 import gevent
 import gevent.pool
 import urlparse
-import re
 import time
 import pymongo
 from .utils import LazyObject, load_class_by_path
@@ -145,45 +144,19 @@ def versiontuple(v):
             elif config_obj == "0":
                 return None
 
-            try:
-                # MongoKit's Connection object is just a wrapped MongoClient.
-                from mongokit import Connection as MongoClient   # pylint: disable=import-error
-                from mongokit import ReplicaSetConnection as MongoReplicaSetClient  # pylint: disable=import-error
-            except ImportError:
-                from pymongo import MongoClient
-                from pymongo import MongoReplicaSetClient
+            from pymongo import MongoClient
 
-            mongo_parsed = re.match(
-                r"mongodb://((\w+):(\w+)@)?([\w\.:,-]+)/([\w-]+)(\?.*)?",
-                config_obj
-            ).groups()
+            mongo_parsed = pymongo.uri_parser.parse_uri(config_obj)
 
-            mongo_hosts = mongo_parsed[3]
-            mongo_name = mongo_parsed[4]
-            mongo_options = mongo_parsed[5]
+            mongo_hosts = mongo_parsed["nodelist"]
+            mongo_name = mongo_parsed["database"]
 
             log.debug("%s: Connecting to MongoDB at %s/%s..." % (attr, mongo_hosts, mongo_name))
 
             kwargs = {}
-            options = {}
-            if mongo_options:
-                options = {
-                    k: v[0]
-                    for k, v in urlparse.parse_qs(mongo_options[1:]).iteritems()
-                }
-
-            # We automatically switch to MongoReplicaSetClient when getting a replicaSet option.
-            # This should cover most use-cases before pymongo 3.0.0 which switches automatically.
-            # http://api.mongodb.org/python/current/examples/high_availability.html#mongoreplicasetclient
-            if options.get("replicaSet") and versiontuple(pymongo.version) < versiontuple("3.0.0"):
-                try:
-                    from mongokit import ReplicaSetConnection as MongoReplicaSetClient  # pylint: disable=import-error
-                except ImportError:
-                    from pymongo import MongoReplicaSetClient
-
-                db = MongoReplicaSetClient(config_obj, **kwargs)[mongo_name]
-            else:
-                db = MongoClient(config_obj, **kwargs)[mongo_name]
+
+            db = MongoClient(config_obj, **kwargs)[mongo_name]
+
             log.debug("%s: ... connected." % (attr))
 
             return db

mrq/monkey.py

@@ -104,17 +104,6 @@ def mrq_monkey_patched(self, *args, **kwargs):
         if hasattr(Collection, method) and getattr(Collection, method).__name__ != "mrq_monkey_patched":
             setattr(Collection, method, gen_monkey_patch(Collection, method))
 
-    # MongoKit completely replaces the code from PyMongo's find() function, so we
-    # need to monkey-patch that as well.
-    try:
-        from mongokit.collection import Collection as MongoKitCollection  # pylint: disable=import-error
-        for method in ["find"]:
-            if getattr(MongoKitCollection, method).__name__ != "mrq_monkey_patched":
-                setattr(MongoKitCollection, method, gen_monkey_patch(MongoKitCollection, method))
-
-    except ImportError:
-        pass
-
 
 # https://code.google.com/p/gevent/issues/detail?id=108
 def patch_import():