diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-python/kombu/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-python/kombu/files')
-rw-r--r-- | dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch | 40 | ||||
-rw-r--r-- | dev-python/kombu/files/kombu-NA-tests-fix.patch | 16 |
2 files changed, 56 insertions, 0 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 new file mode 100644 index 000000000000..b2e1185b7ca8 --- /dev/null +++ b/dev-python/kombu/files/kombu-3.0.26-pymongo-test-fix.patch @@ -0,0 +1,40 @@ +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'], + diff --git a/dev-python/kombu/files/kombu-NA-tests-fix.patch b/dev-python/kombu/files/kombu-NA-tests-fix.patch new file mode 100644 index 000000000000..a4bcda6e292d --- /dev/null +++ b/dev-python/kombu/files/kombu-NA-tests-fix.patch @@ -0,0 +1,16 @@ +https://github.com/celery/kombu/commit/828ba134105eeb4c6df52cb4441cf90c297b77e3 +Fixes NA bug with amqplib. +diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py +index feedee7..f57e28c 100644 +--- a/kombu/transport/amqplib.py ++++ b/kombu/transport/amqplib.py +@@ -17,6 +17,9 @@ class SSLError(Exception): # noqa + pass + from struct import unpack + ++class NA(object): ++ pass ++ + try: + from amqplib import client_0_8 as amqp + from amqplib.client_0_8 import transport |