summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2017-05-02 20:37:53 +0200
committerMichał Górny <mgorny@gentoo.org>2017-05-02 21:15:23 +0200
commit4163e796f3c2dc0116d2caf063f3692b55dc81da (patch)
tree049aabc1846e2d564820675a01ead819ef991363 /dev-python/kombu/files
parentdev-python/pathtools: Clean old versions up (diff)
downloadgentoo-4163e796f3c2dc0116d2caf063f3692b55dc81da.tar.gz
gentoo-4163e796f3c2dc0116d2caf063f3692b55dc81da.tar.bz2
gentoo-4163e796f3c2dc0116d2caf063f3692b55dc81da.zip
dev-python/kombu: Clean old versions up
Diffstat (limited to 'dev-python/kombu/files')
-rw-r--r--dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch40
1 files changed, 0 insertions, 40 deletions
diff --git a/dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch b/dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch
deleted file mode 100644
index b2e1185b7ca8..000000000000
--- a/dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/celery/kombu/commit/8e6aed9fcf978b6c34108c0d37b720bd125f0352
-diff --git a/kombu/tests/transport/test_mongodb.py b/kombu/tests/transport/test_mongodb.py
-index b4d10fc..58c92e7 100644
---- a/kombu/tests/transport/test_mongodb.py
-+++ b/kombu/tests/transport/test_mongodb.py
-@@ -64,12 +64,12 @@ def test_custom_credentials(self):
-
- @skip_if_not_module('pymongo')
- def test_options(self):
-- url = 'mongodb://localhost,localhost2:29017/dbname?safe=true'
-+ url = 'mongodb://localhost,localhost2:29017/dbname?tz_aware=true'
- c = self._get_connection(url)
-
- hostname, dbname, options = c.channels[0]._parse_uri()
-
-- self.assertEqual(options['safe'], True)
-+ self.assertEqual(options['tz_aware'], True)
-
- @skip_if_not_module('pymongo')
- def test_real_connections(self):
-diff --git a/kombu/transport/mongodb.py b/kombu/transport/mongodb.py
-index 9137132..40b00ff 100644
---- a/kombu/transport/mongodb.py
-+++ b/kombu/transport/mongodb.py
-@@ -176,9 +176,14 @@ def _parse_uri(self, scheme='mongodb://'):
-
- return hostname, dbname, options
-
-+ def _prepare_client_options(self, options):
-+ if pymongo.version_tuple >= (3, ):
-+ options.pop('auto_start_request', None)
-+
- def _open(self, scheme='mongodb://'):
- hostname, dbname, options = self._parse_uri(scheme=scheme)
-
-+ self._prepare_client_options(options)
- mongoconn = MongoClient(
- host=hostname, ssl=options['ssl'],
- auto_start_request=options['auto_start_request'],
-