Hello community, here is the log from the commit of package python3-kombu for openSUSE:Factory checked in at 2016-03-07 13:28:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python3-kombu (Old) and /work/SRC/openSUSE:Factory/.python3-kombu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python3-kombu" Changes: -------- --- /work/SRC/openSUSE:Factory/python3-kombu/python3-kombu.changes 2016-01-30 11:31:23.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python3-kombu.new/python3-kombu.changes 2016-03-07 13:30:03.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 5 16:28:06 UTC 2016 - [email protected] + +- update to version 3.0.34: + * Qpid: Adds async error handling. Contributed by Brian Bouterse. + * Qpid: Delivery tag is now a UUID4 (Issue #563). Fix contributed + by Brian Bouterse. + * Redis: Connection.as_uri() returned malformed URLs when the + "redis+socket" scheme was ised (Issue celery/celery#2995). + * msgpack: Use binary encoding instead of utf-8 (Issue #570). + +------------------------------------------------------------------- Old: ---- kombu-3.0.33.tar.gz New: ---- kombu-3.0.34.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python3-kombu.spec ++++++ --- /var/tmp/diff_new_pack.5PsU2x/_old 2016-03-07 13:30:04.000000000 +0100 +++ /var/tmp/diff_new_pack.5PsU2x/_new 2016-03-07 13:30:04.000000000 +0100 @@ -17,7 +17,7 @@ Name: python3-kombu -Version: 3.0.33 +Version: 3.0.34 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause ++++++ kombu-3.0.33.tar.gz -> kombu-3.0.34.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/Changelog new/kombu-3.0.34/Changelog --- old/kombu-3.0.33/Changelog 2016-01-09 03:36:24.000000000 +0100 +++ new/kombu-3.0.34/Changelog 2016-03-04 02:29:37.000000000 +0100 @@ -4,6 +4,26 @@ Change history ================ +.. _version-3.0.34: + +3.0.34 +====== +:release-date: 2016-03-03 05:30 P.M PST +:release-by: Ask Solem + +- Qpid: Adds async error handling. + + Contributed by Brian Bouterse. + +- Qpid: Delivery tag is now a UUID4 (Issue #563). + + Fix contributed by Brian Bouterse. + +- Redis: Connection.as_uri() returned malformed URLs when the + ``redis+socket`` scheme was ised (Issue celery/celery#2995). + +- msgpack: Use binary encoding instead of utf-8 (Issue #570). + .. _version-3.0.33: 3.0.33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/LICENSE new/kombu-3.0.34/LICENSE --- old/kombu-3.0.33/LICENSE 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/LICENSE 2016-03-04 02:28:42.000000000 +0100 @@ -1,7 +1,6 @@ -Copyright (c) 2015 Ask Solem & contributors. All rights reserved. +Copyright (c) 2015-2016 Ask Solem & contributors. All rights reserved. Copyright (c) 2012-2014 GoPivotal, Inc. All rights reserved. -Copyright (c) 2009-2012, Ask Solem & contributors. -All rights reserved. +Copyright (c) 2009-2012, Ask Solem & contributors. All rights reserved. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/PKG-INFO new/kombu-3.0.34/PKG-INFO --- old/kombu-3.0.33/PKG-INFO 2016-01-09 03:38:13.000000000 +0100 +++ new/kombu-3.0.34/PKG-INFO 2016-03-04 02:56:23.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 3.0.33 +Version: 3.0.34 Summary: Messaging library for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging library for Python ======================================== - :Version: 3.0.33 + :Version: 3.0.34 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/README.rst new/kombu-3.0.34/README.rst --- old/kombu-3.0.33/README.rst 2016-01-09 03:12:59.000000000 +0100 +++ new/kombu-3.0.34/README.rst 2016-03-04 02:30:07.000000000 +0100 @@ -4,7 +4,7 @@ kombu - Messaging library for Python ======================================== -:Version: 3.0.33 +:Version: 3.0.34 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/docs/changelog.rst new/kombu-3.0.34/docs/changelog.rst --- old/kombu-3.0.33/docs/changelog.rst 2016-01-09 03:36:24.000000000 +0100 +++ new/kombu-3.0.34/docs/changelog.rst 2016-03-04 02:29:37.000000000 +0100 @@ -4,6 +4,26 @@ Change history ================ +.. _version-3.0.34: + +3.0.34 +====== +:release-date: 2016-03-03 05:30 P.M PST +:release-by: Ask Solem + +- Qpid: Adds async error handling. + + Contributed by Brian Bouterse. + +- Qpid: Delivery tag is now a UUID4 (Issue #563). + + Fix contributed by Brian Bouterse. + +- Redis: Connection.as_uri() returned malformed URLs when the + ``redis+socket`` scheme was ised (Issue celery/celery#2995). + +- msgpack: Use binary encoding instead of utf-8 (Issue #570). + .. _version-3.0.33: 3.0.33 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/docs/conf.py new/kombu-3.0.34/docs/conf.py --- old/kombu-3.0.33/docs/conf.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/docs/conf.py 2016-03-04 02:28:42.000000000 +0100 @@ -29,7 +29,7 @@ # General information about the project. project = 'Kombu' -copyright = '2009-2014, Ask Solem' +copyright = '2009-2016, Ask Solem' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/docs/introduction.rst new/kombu-3.0.34/docs/introduction.rst --- old/kombu-3.0.33/docs/introduction.rst 2016-01-09 03:12:59.000000000 +0100 +++ new/kombu-3.0.34/docs/introduction.rst 2016-03-04 02:30:07.000000000 +0100 @@ -4,7 +4,7 @@ kombu - Messaging library for Python ======================================== -:Version: 3.0.33 +:Version: 3.0.34 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/default.txt new/kombu-3.0.34/extra/requirements/default.txt --- old/kombu-3.0.33/extra/requirements/default.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/default.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,2 @@ +anyjson>=0.3.3 +amqp>=1.4.9,<2.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/dev.txt new/kombu-3.0.34/extra/requirements/dev.txt --- old/kombu-3.0.33/extra/requirements/dev.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/dev.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +https://github.com/celery/py-amqp/zipball/master diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/docs.txt new/kombu-3.0.34/extra/requirements/docs.txt --- old/kombu-3.0.33/extra/requirements/docs.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/docs.txt 2014-01-22 21:00:00.000000000 +0100 @@ -0,0 +1,3 @@ +Sphinx +sphinxcontrib-issuetracker>=0.9 +Django diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/beanstalk.txt new/kombu-3.0.34/extra/requirements/extras/beanstalk.txt --- old/kombu-3.0.33/extra/requirements/extras/beanstalk.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/beanstalk.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +beanstalkc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/couchdb.txt new/kombu-3.0.34/extra/requirements/extras/couchdb.txt --- old/kombu-3.0.33/extra/requirements/extras/couchdb.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/couchdb.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +couchdb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/kazoo.txt new/kombu-3.0.34/extra/requirements/extras/kazoo.txt --- old/kombu-3.0.33/extra/requirements/extras/kazoo.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/kazoo.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/librabbitmq.txt new/kombu-3.0.34/extra/requirements/extras/librabbitmq.txt --- old/kombu-3.0.33/extra/requirements/extras/librabbitmq.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/librabbitmq.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +librabbitmq>=1.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/mongodb.txt new/kombu-3.0.34/extra/requirements/extras/mongodb.txt --- old/kombu-3.0.33/extra/requirements/extras/mongodb.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/mongodb.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +pymongo>=2.6.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/msgpack.txt new/kombu-3.0.34/extra/requirements/extras/msgpack.txt --- old/kombu-3.0.33/extra/requirements/extras/msgpack.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/msgpack.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +msgpack-python>=0.3.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/pyro.txt new/kombu-3.0.34/extra/requirements/extras/pyro.txt --- old/kombu-3.0.33/extra/requirements/extras/pyro.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/pyro.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +pyro4 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/qpid.txt new/kombu-3.0.34/extra/requirements/extras/qpid.txt --- old/kombu-3.0.33/extra/requirements/extras/qpid.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/qpid.txt 2015-09-29 23:47:57.000000000 +0200 @@ -0,0 +1,2 @@ +qpid-python>=0.26 +qpid-tools>=0.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/redis.txt new/kombu-3.0.34/extra/requirements/extras/redis.txt --- old/kombu-3.0.33/extra/requirements/extras/redis.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/redis.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +redis>=2.10.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/slmq.txt new/kombu-3.0.34/extra/requirements/extras/slmq.txt --- old/kombu-3.0.33/extra/requirements/extras/slmq.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/slmq.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +softlayer_messaging>=1.0.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/sqlalchemy.txt new/kombu-3.0.34/extra/requirements/extras/sqlalchemy.txt --- old/kombu-3.0.33/extra/requirements/extras/sqlalchemy.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/sqlalchemy.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +sqlalchemy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/sqs.txt new/kombu-3.0.34/extra/requirements/extras/sqs.txt --- old/kombu-3.0.33/extra/requirements/extras/sqs.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/sqs.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1 @@ +boto>=2.13.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/yaml.txt new/kombu-3.0.34/extra/requirements/extras/yaml.txt --- old/kombu-3.0.33/extra/requirements/extras/yaml.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/yaml.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +PyYAML>=3.10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/zeromq.txt new/kombu-3.0.34/extra/requirements/extras/zeromq.txt --- old/kombu-3.0.33/extra/requirements/extras/zeromq.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/zeromq.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +pyzmq>=13.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/extras/zookeeper.txt new/kombu-3.0.34/extra/requirements/extras/zookeeper.txt --- old/kombu-3.0.33/extra/requirements/extras/zookeeper.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/extras/zookeeper.txt 2015-09-25 21:25:05.000000000 +0200 @@ -0,0 +1 @@ +kazoo>=1.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/funtest.txt new/kombu-3.0.34/extra/requirements/funtest.txt --- old/kombu-3.0.33/extra/requirements/funtest.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/funtest.txt 2015-09-29 23:47:57.000000000 +0200 @@ -0,0 +1,28 @@ +# redis transport +redis + +# MongoDB transport +pymongo + +# CouchDB transport +couchdb + +# Beanstalk transport +beanstalkc + +# Zookeeper transport +kazoo + +# SQLAlchemy transport +kombu-sqlalchemy + +# Django ORM transport +Django +django-kombu + +# SQS transport +boto + +# Qpid transport +qpid-python>=0.26 +qpid-tools>=0.26 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/pkgutils.txt new/kombu-3.0.34/extra/requirements/pkgutils.txt --- old/kombu-3.0.33/extra/requirements/pkgutils.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/pkgutils.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,3 @@ +paver +flake8 +Sphinx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/py26.txt new/kombu-3.0.34/extra/requirements/py26.txt --- old/kombu-3.0.33/extra/requirements/py26.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/py26.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,2 @@ +importlib +ordereddict diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/test-ci.txt new/kombu-3.0.34/extra/requirements/test-ci.txt --- old/kombu-3.0.33/extra/requirements/test-ci.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/test-ci.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,6 @@ +boto +coverage>=3.0 +coveralls +redis +PyYAML +msgpack-python>0.2.0 # 0.2.0 dropped 2.5 support diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/test-ci3.txt new/kombu-3.0.34/extra/requirements/test-ci3.txt --- old/kombu-3.0.33/extra/requirements/test-ci3.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/test-ci3.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,6 @@ +coverage>=3.0 +coveralls +redis +PyYAML +msgpack-python>0.2.0 # 0.2.0 dropped 2.5 support +boto diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/test.txt new/kombu-3.0.34/extra/requirements/test.txt --- old/kombu-3.0.33/extra/requirements/test.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/test.txt 2015-09-29 23:47:57.000000000 +0200 @@ -0,0 +1,3 @@ +nose +unittest2>=0.5.0 +mock diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/extra/requirements/test3.txt new/kombu-3.0.34/extra/requirements/test3.txt --- old/kombu-3.0.33/extra/requirements/test3.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/kombu-3.0.34/extra/requirements/test3.txt 2016-03-04 02:28:42.000000000 +0100 @@ -0,0 +1,3 @@ +setuptools>=0.7 +nose +mock>=0.7.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/__init__.py new/kombu-3.0.34/kombu/__init__.py --- old/kombu-3.0.33/kombu/__init__.py 2016-01-09 03:12:55.000000000 +0100 +++ new/kombu-3.0.34/kombu/__init__.py 2016-03-04 02:29:47.000000000 +0100 @@ -11,7 +11,7 @@ 'version_info_t', ('major', 'minor', 'micro', 'releaselevel', 'serial'), ) -VERSION = version_info_t(3, 0, 33, '', '') +VERSION = version_info_t(3, 0, 34, '', '') __version__ = '{0.major}.{0.minor}.{0.micro}{0.releaselevel}'.format(VERSION) __author__ = 'Ask Solem' __contact__ = '[email protected]' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/connection.py new/kombu-3.0.34/kombu/connection.py --- old/kombu-3.0.33/kombu/connection.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/kombu/connection.py 2016-03-04 02:28:42.000000000 +0100 @@ -574,12 +574,13 @@ if self.uri_prefix: return '%s+%s' % (self.uri_prefix, hostname) return self.hostname + if self.uri_prefix: + return '%s+%s' % (self.uri_prefix, hostname) fields = self.info() port, userid, password, vhost, transport = getfields(fields) - scheme = ('{0}+{1}'.format(self.uri_prefix, transport) - if self.uri_prefix else transport) + return as_url( - scheme, hostname, port, userid, password, quote(vhost), + transport, hostname, port, userid, password, quote(vhost), sanitize=not include_password, mask=mask, ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/serialization.py new/kombu-3.0.34/kombu/serialization.py --- old/kombu-3.0.33/kombu/serialization.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/kombu/serialization.py 2016-03-04 02:28:42.000000000 +0100 @@ -364,10 +364,7 @@ """See http://msgpack.sourceforge.net/"""; try: try: - from msgpack import packb as pack, unpackb - - def unpack(s, encoding='utf-8'): - return unpackb(s, encoding=encoding) + from msgpack import packb as pack, unpackb as unpack except ImportError: # msgpack < 0.2.0 and Python 2.5 from msgpack import packs as pack, unpacks as unpack # noqa diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/tests/test_connection.py new/kombu-3.0.34/kombu/tests/test_connection.py --- old/kombu-3.0.33/kombu/tests/test_connection.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/kombu/tests/test_connection.py 2016-03-04 02:28:42.000000000 +0100 @@ -41,9 +41,10 @@ self.assertEqual(conn.as_uri(include_password=True), self.url) def test_as_uri_when_prefix(self): - conn = Connection('memory://') - conn.uri_prefix = 'foo' - self.assertTrue(conn.as_uri().startswith('foo+memory://')) + conn = Connection('redis+socket:///var/spool/x/y/z/redis.sock') + self.assertEqual( + conn.as_uri(), 'redis+socket:///var/spool/x/y/z/redis.sock', + ) @skip_if_not_module('pymongo') def test_as_uri_when_mongodb(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/tests/test_serialization.py new/kombu-3.0.34/kombu/tests/test_serialization.py --- old/kombu-3.0.33/kombu/tests/test_serialization.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/kombu/tests/test_serialization.py 2016-03-04 02:53:54.000000000 +0100 @@ -8,7 +8,7 @@ from base64 import b64decode from kombu.exceptions import ContentDisallowed, EncodeError, DecodeError -from kombu.five import text_t, bytes_t +from kombu.five import text_t, bytes_t, items from kombu.serialization import ( registry, register, SerializerNotInstalled, raw_encode, register_yaml, register_msgpack, @@ -60,8 +60,13 @@ msgpack_py_data = dict(py_data) +msgpack_py_data['unicode'] = b'Th quick brown fox jumps over th lazy dog' +msgpack_py_data['list'] = [str_to_bytes(x) for x in msgpack_py_data['list']] +msgpack_py_data = dict( + (str_to_bytes(k), str_to_bytes(v) if isinstance(v, text_t) else v) + for k, v in items(msgpack_py_data) +) # Unicode chars are lost in transmit :( -msgpack_py_data['unicode'] = 'Th quick brown fox jumps over th lazy dog' msgpack_data = b64decode(str_to_bytes("""\ haNpbnQKpWZsb2F0y0AJIftTyNTxpGxpc3SUpmdlb3JnZaVqZXJyeaZlbGFpbmWlY29zbW+mc3Rya\ W5n2gArVGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZ6d1bmljb2Rl2g\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/tests/transport/test_qpid.py new/kombu-3.0.34/kombu/tests/transport/test_qpid.py --- old/kombu-3.0.33/kombu/tests/transport/test_qpid.py 2016-01-08 23:35:32.000000000 +0100 +++ new/kombu-3.0.34/kombu/tests/transport/test_qpid.py 2016-03-04 02:28:42.000000000 +0100 @@ -5,6 +5,7 @@ import socket import sys import time +import uuid from collections import Callable from itertools import count @@ -940,10 +941,6 @@ self.assertIn('base64', Channel.codecs) self.assertIsInstance(Channel.codecs['base64'], Base64) - def test_delivery_tags(self): - """Test that _delivery_tags is using itertools""" - self.assertIsInstance(Channel._delivery_tags, count) - def test_size(self): """Test getting the number of messages in a queue specified by name and returning them.""" @@ -1321,7 +1318,7 @@ mock_message['properties']['body_encoding'], mock_body_encoding, ) self.assertIsInstance( - mock_message['properties']['delivery_tag'], int, + mock_message['properties']['delivery_tag'], uuid.UUID, ) self.assertIs( mock_message['properties']['delivery_info']['exchange'], @@ -1709,13 +1706,29 @@ transport='tcp', ) - def test_transport_sets_qpid_message_received_handler(self): + def test_transport_sets_qpid_message_ready_handler(self): self.transport.establish_connection() - qpid_conn = self.mock_conn.return_value.get_qpid_connection - new_mock_session = qpid_conn.return_value.session.return_value - mock_set_callback = new_mock_session.set_message_received_handler - expected_callback = self.transport._qpid_session_ready - mock_set_callback.assert_called_once_with(expected_callback) + qpid_conn_call = self.mock_conn.return_value.get_qpid_connection + mock_session = qpid_conn_call.return_value.session.return_value + mock_set_callback = mock_session.set_message_received_notify_handler + expected_msg_callback = self.transport._qpid_message_ready_handler + mock_set_callback.assert_called_once_with(expected_msg_callback) + + def test_transport_sets_session_exception_handler(self): + self.transport.establish_connection() + qpid_conn_call = self.mock_conn.return_value.get_qpid_connection + mock_session = qpid_conn_call.return_value.session.return_value + mock_set_callback = mock_session.set_async_exception_notify_handler + exc_callback = self.transport._qpid_async_exception_notify_handler + mock_set_callback.assert_called_once_with(exc_callback) + + def test_transport_sets_connection_exception_handler(self): + self.transport.establish_connection() + qpid_conn_call = self.mock_conn.return_value.get_qpid_connection + qpid_conn = qpid_conn_call.return_value + mock_set_callback = qpid_conn.set_async_exception_notify_handler + exc_callback = self.transport._qpid_async_exception_notify_handler + mock_set_callback.assert_called_once_with(exc_callback) @case_no_python3 @@ -1769,7 +1782,7 @@ @case_no_python3 @case_no_pypy @disable_runtime_dependency_check -class TestTransportQpidSessionReady(Case): +class TestTransportQpidCallbackHandlers(Case): def setUp(self): self.patch_a = patch(QPID_MODULE + '.os.write') @@ -1779,10 +1792,14 @@ def tearDown(self): self.patch_a.stop() - def test_transport__qpid_session_ready_writes_symbol_to_fd(self): - self.transport._qpid_session_ready() + def test__qpid_message_ready_handler_writes_symbol_to_fd(self): + self.transport._qpid_message_ready_handler(Mock()) self.mock_os_write.assert_called_once_with(self.transport._w, '0') + def test__qpid_async_exception_notify_handler_writes_symbol_to_fd(self): + self.transport._qpid_async_exception_notify_handler(Mock(), Mock()) + self.mock_os_write.assert_called_once_with(self.transport._w, 'e') + @case_no_python3 @case_no_pypy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu/transport/qpid.py new/kombu-3.0.34/kombu/transport/qpid.py --- old/kombu-3.0.33/kombu/transport/qpid.py 2016-01-09 03:12:35.000000000 +0100 +++ new/kombu-3.0.34/kombu/transport/qpid.py 2016-03-04 02:28:42.000000000 +0100 @@ -79,8 +79,8 @@ import ssl import sys import time +import uuid -from itertools import count from gettext import gettext as _ import amqp.protocol @@ -159,7 +159,7 @@ ACKed asynchronously through a call to :meth:`ack`. Messages that are received, but not ACKed will not be delivered by the broker to another consumer until an ACK is received, or the session is closed. Messages - are referred to using delivery_tag integers, which are unique per + are referred to using delivery_tag, which are unique per :class:`Channel`. Delivery tags are managed outside of this object and are passed in with a message to :meth:`append`. Un-ACKed messages can be looked up from QoS using :meth:`get` and can be rejected and @@ -213,15 +213,15 @@ def append(self, message, delivery_tag): """Append message to the list of un-ACKed messages. - Add a message, referenced by the integer delivery_tag, for ACKing, + Add a message, referenced by the delivery_tag, for ACKing, rejecting, or getting later. Messages are saved into an :class:`~kombu.utils.compat.OrderedDict` by delivery_tag. :param message: A received message that has not yet been ACKed. :type message: qpid.messaging.Message - :param delivery_tag: An integer number to refer to this message by + :param delivery_tag: A UUID to refer to this message by upon receipt. - :type delivery_tag: int + :type delivery_tag: uuid.UUID """ self._not_yet_acked[delivery_tag] = message @@ -232,7 +232,7 @@ :param delivery_tag: The delivery tag associated with the message to be returned. - :type delivery_tag: int + :type delivery_tag: uuid.UUID :return: An un-ACKed message that is looked up by delivery_tag. :rtype: qpid.messaging.Message @@ -247,7 +247,7 @@ :param delivery_tag: the delivery tag associated with the message to be acknowledged. - :type delivery_tag: int + :type delivery_tag: uuid.UUID """ message = self._not_yet_acked.pop(delivery_tag) self.session.acknowledge(message=message) @@ -265,7 +265,7 @@ :param delivery_tag: The delivery tag associated with the message to be rejected. - :type delivery_tag: int + :type delivery_tag: uuid.UUID :keyword requeue: If True, the broker will be notified to requeue the message. If False, the broker will be told to drop the message entirely. In both cases, the message will be removed @@ -310,10 +310,9 @@ Messages sent using this Channel are assigned a delivery_tag. The delivery_tag is generated for a message as they are prepared for sending by :meth:`basic_publish`. The delivery_tag is unique per - Channel instance using :meth:`~itertools.count`. The delivery_tag has - no meaningful context in other objects, and is only maintained in the - memory of this object, and the underlying :class:`QoS` object that - provides support. + Channel instance. The delivery_tag has no meaningful context in other + objects, and is only maintained in the memory of this object, and the + underlying :class:`QoS` object that provides support. Each Channel object instantiates exactly one :class:`QoS` object for prefetch limiting, and asynchronous ACKing. The :class:`QoS` object is @@ -368,9 +367,6 @@ #: Binary <-> ASCII codecs. codecs = {'base64': Base64()} - #: counter used to generate delivery tags for this channel. - _delivery_tags = count(1) - def __init__(self, connection, transport): """Instantiate a Channel object. @@ -844,7 +840,7 @@ :param delivery_tag: The delivery tag associated with the message to be acknowledged. - :type delivery_tag: int + :type delivery_tag: uuid.UUID """ self.qos.ack(delivery_tag) @@ -862,7 +858,7 @@ :param delivery_tag: The delivery tag associated with the message to be rejected. - :type delivery_tag: int + :type delivery_tag: uuid.UUID :keyword requeue: If False, the rejected message will be dropped by the broker and not delivered to any other consumers. If True, then the rejected message will be requeued for delivery to @@ -903,10 +899,9 @@ handled by the caller of :meth:`~Transport.drain_events`. Messages can be ACKed after being received through a call to :meth:`basic_ack`. - If no_ack is True, the messages are immediately ACKed to avoid a - memory leak in qpid.messaging when messages go un-ACKed. The no_ack - flag indicates that the receiver of the message does not intent to - call :meth:`basic_ack`. + If no_ack is True, The no_ack flag indicates that the receiver of + the message will not call :meth:`basic_ack` later. Since the + message will not be ACKed later, it is ACKed immediately. :meth:`basic_consume` transforms the message object type prior to calling the callback. Initially the message comes in as a @@ -942,9 +937,7 @@ delivery_tag = message.delivery_tag self.qos.append(qpid_message, delivery_tag) if no_ack: - # Celery will not ack this message later, so we should to - # avoid a memory leak in qpid.messaging due to un-ACKed - # messages. + # Celery will not ack this message later, so we should ack now self.basic_ack(delivery_tag) return callback(message) @@ -1070,7 +1063,7 @@ - wraps the body as a buffer object, so that :class:`qpid.messaging.endpoints.Sender` uses a content type that can support arbitrarily large messages. - - assigns a delivery_tag generated through self._delivery_tags + - sets delivery_tag to a random uuid.UUID - sets the exchange and routing_key info as delivery_info Internally uses :meth:`_put` to send the message synchronously. This @@ -1096,7 +1089,7 @@ props = message['properties'] props.update( body_encoding=body_encoding, - delivery_tag=next(self._delivery_tags), + delivery_tag=uuid.uuid4(), ) props['delivery_info'].update( exchange=exchange, @@ -1441,9 +1434,12 @@ 'with your package manager. You can also try `pip install ' 'qpid-python`.') - def _qpid_session_ready(self): + def _qpid_message_ready_handler(self, session): os.write(self._w, '0') + def _qpid_async_exception_notify_handler(self, obj_with_exception, exc): + os.write(self._w, 'e') + def on_readable(self, connection, loop): """Handle any messages associated with this Transport. @@ -1600,7 +1596,15 @@ conn = self.Connection(**opts) conn.client = self.client self.session = conn.get_qpid_connection().session() - self.session.set_message_received_handler(self._qpid_session_ready) + self.session.set_message_received_notify_handler( + self._qpid_message_ready_handler + ) + conn.get_qpid_connection().set_async_exception_notify_handler( + self._qpid_async_exception_notify_handler + ) + self.session.set_async_exception_notify_handler( + self._qpid_async_exception_notify_handler + ) return conn def close_connection(self, connection): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu.egg-info/PKG-INFO new/kombu-3.0.34/kombu.egg-info/PKG-INFO --- old/kombu-3.0.33/kombu.egg-info/PKG-INFO 2016-01-09 03:38:05.000000000 +0100 +++ new/kombu-3.0.34/kombu.egg-info/PKG-INFO 2016-03-04 02:55:48.000000000 +0100 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 3.0.33 +Version: 3.0.34 Summary: Messaging library for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging library for Python ======================================== - :Version: 3.0.33 + :Version: 3.0.34 `Kombu` is a messaging library for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu.egg-info/SOURCES.txt new/kombu-3.0.34/kombu.egg-info/SOURCES.txt --- old/kombu-3.0.33/kombu.egg-info/SOURCES.txt 2016-01-09 03:38:05.000000000 +0100 +++ new/kombu-3.0.34/kombu.egg-info/SOURCES.txt 2016-03-04 02:55:49.000000000 +0100 @@ -114,6 +114,31 @@ extra/release/flakeplus.py extra/release/removepyc.sh extra/release/verify-reference-index.sh +extra/requirements/default.txt +extra/requirements/dev.txt +extra/requirements/docs.txt +extra/requirements/funtest.txt +extra/requirements/pkgutils.txt +extra/requirements/py26.txt +extra/requirements/test-ci.txt +extra/requirements/test-ci3.txt +extra/requirements/test.txt +extra/requirements/test3.txt +extra/requirements/extras/beanstalk.txt +extra/requirements/extras/couchdb.txt +extra/requirements/extras/kazoo.txt +extra/requirements/extras/librabbitmq.txt +extra/requirements/extras/mongodb.txt +extra/requirements/extras/msgpack.txt +extra/requirements/extras/pyro.txt +extra/requirements/extras/qpid.txt +extra/requirements/extras/redis.txt +extra/requirements/extras/slmq.txt +extra/requirements/extras/sqlalchemy.txt +extra/requirements/extras/sqs.txt +extra/requirements/extras/yaml.txt +extra/requirements/extras/zeromq.txt +extra/requirements/extras/zookeeper.txt funtests/__init__.py funtests/setup.cfg funtests/setup.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/kombu.egg-info/requires.txt new/kombu-3.0.34/kombu.egg-info/requires.txt --- old/kombu-3.0.33/kombu.egg-info/requires.txt 2016-01-09 03:38:05.000000000 +0100 +++ new/kombu-3.0.34/kombu.egg-info/requires.txt 2016-03-04 02:55:48.000000000 +0100 @@ -1,49 +1,49 @@ anyjson>=0.3.3 amqp>=1.4.9,<2.0 -[sqlalchemy] -sqlalchemy +[:python_version=="2.6"] +importlib +ordereddict + +[beanstalk] +beanstalkc + +[couchdb] +couchdb [librabbitmq] librabbitmq>=1.6.1 -[sqs] -boto>=2.13.3 - [mongodb] pymongo>=2.6.2 -[zookeeper] -kazoo>=1.3.1 - -[beanstalk] -beanstalkc +[msgpack] +msgpack-python>=0.3.0 -[slmq] -softlayer_messaging>=1.0.3 +[pyro] +pyro4 [qpid] qpid-python>=0.26 qpid-tools>=0.26 -[msgpack] -msgpack-python>=0.3.0 - -[couchdb] -couchdb - [redis] redis>=2.10.3 -[:python_version=="2.6"] -importlib -ordereddict +[slmq] +softlayer_messaging>=1.0.3 -[pyro] -pyro4 +[sqlalchemy] +sqlalchemy + +[sqs] +boto>=2.13.3 [yaml] PyYAML>=3.10 [zeromq] -pyzmq>=13.1.0 \ No newline at end of file +pyzmq>=13.1.0 + +[zookeeper] +kazoo>=1.3.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-3.0.33/setup.cfg new/kombu-3.0.34/setup.cfg --- old/kombu-3.0.33/setup.cfg 2016-01-09 03:38:13.000000000 +0100 +++ new/kombu-3.0.34/setup.cfg 2016-03-04 02:56:23.000000000 +0100 @@ -13,7 +13,7 @@ [bdist_rpm] requires = anyjson >= 0.3.3 - amqp >= 1.4.6 + amqp >= 1.4.9 importlib ordereddict @@ -23,7 +23,7 @@ [metadata] requires-dist = anyjson >= 0.3.3 - amqp >= 1.4.5,<2.0 + amqp >= 1.4.9,<2.0 importlib; python_version == "2.6" ordereddict; python_version == "2.6"
