Hello community, here is the log from the commit of package python-kombu for openSUSE:Factory checked in at 2013-09-03 22:03:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-kombu (Old) and /work/SRC/openSUSE:Factory/.python-kombu.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-kombu" Changes: -------- --- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes 2013-08-13 13:21:51.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.python-kombu.new/python-kombu.changes 2013-09-03 22:03:27.000000000 +0200 @@ -1,0 +2,10 @@ +Tue Sep 3 08:08:47 UTC 2013 - dmuel...@suse.com + +- update to 2.5.14: + * safe_str did not work properly resulting in UnicodeDecodeError + * Now depends on amqp 1.0.13 + * Fixed typo in Django functional tests. + * Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + +------------------------------------------------------------------- @@ -4 +14 @@ -- update to 1.0.12: +- update to 2.5.12: Old: ---- kombu-2.5.12.tar.gz New: ---- kombu-2.5.14.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-kombu.spec ++++++ --- /var/tmp/diff_new_pack.fjUF4w/_old 2013-09-03 22:03:28.000000000 +0200 +++ /var/tmp/diff_new_pack.fjUF4w/_new 2013-09-03 22:03:28.000000000 +0200 @@ -17,7 +17,7 @@ Name: python-kombu -Version: 2.5.12 +Version: 2.5.14 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause @@ -72,7 +72,7 @@ # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py # NOTE(saschpe): We have a newer python-amqp, but this shouldn't be an issue: -sed -i -e "s|amqp>=1.0.12,<1.1.0|amqp>=1.0.12|" requirements/default.txt kombu.egg-info/requires.txt +sed -i -e "s|amqp>=1.0.13,<1.1.0|amqp>=1.0.13|" requirements/default.txt kombu.egg-info/requires.txt # NOTE(saschpe): Testsuite requires mkgpack-python < 0.2.0 because it dropped # Python-2.5 support. This makes no sense for us, thus: #sed -i "s/msgpack-python.*/msgpack-python/" requirements/test.txt ++++++ kombu-2.5.12.tar.gz -> kombu-2.5.14.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/AUTHORS new/kombu-2.5.14/AUTHORS --- old/kombu-2.5.12/AUTHORS 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/AUTHORS 2013-08-23 17:09:28.000000000 +0200 @@ -20,6 +20,7 @@ Christophe Chauvet <christophe.chau...@gmail.com> Christopher Grebs <c...@webshox.org> Clay Gerrard <clay.gerr...@gmail.com> +Corentin Ardeois <carde...@iweb.com> Dan LaMotte <lamott...@gmail.com> Dan McGee <d...@archlinux.org> Dane Guempel <daneguem...@gmail.com> @@ -31,7 +32,7 @@ Flavio [FlaPer87] Percoco Premoli <flape...@flaper87.org> Florian Munz <s...@theflow.de> Franck Cuny <fc...@saymedia.com> -German M. Bravo <german...@deipi.com> +Germán M. Bravo <german...@gmail.com> Gregory Haskins <g...@greghaskins.com> Hong Minhee <min...@dahlia.kr> Ian Eure <ian.e...@gmail.com> @@ -69,6 +70,7 @@ Rumyana Neykova <rumi.neyk...@gmail.com> Rune Halvorsen <ru...@opera.com> Ryan Petrello <li...@ryanpetrello.com> +Sascha Peilicke <sasc...@gmx.de> Scott Lyons <scottaly...@gmail.com> Sean Bleier <seble...@gmail.com> Sean Creeley <sean.cree...@gmail.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/Changelog new/kombu-2.5.14/Changelog --- old/kombu-2.5.12/Changelog 2013-06-28 16:26:59.000000000 +0200 +++ new/kombu-2.5.14/Changelog 2013-08-23 18:05:37.000000000 +0200 @@ -4,6 +4,41 @@ Change history ================ +.. _version-2.5.14: + +2.5.14 +====== +:release-date: 2014-08-23 17:00 P.M BST + +- safe_str did not work properly resulting in + :exc:`UnicodeDecodeError` (Issue #248). + +.. _version-2.5.13: + +2.5.13 +====== +:release-date: 2013-08-16 16:00 P.M BST + +- Now depends on :mod:`amqp` 1.0.13 + +- Fixed typo in Django functional tests. + +- safe_str now returns Unicode in Python 2.x + + Fix contributed by Germán M. Bravo. + +- amqp: Transport options are now merged with arguments + supplied to the connection. + +- Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + + Fix contributed by Sascha Peilicke. + +- ConsumerMixin now also restarts on channel related errors. + + Fix contributed by Corentin Ardeois. + .. _version-2.5.12: 2.5.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/PKG-INFO new/kombu-2.5.14/PKG-INFO --- old/kombu-2.5.12/PKG-INFO 2013-06-28 16:28:18.000000000 +0200 +++ new/kombu-2.5.14/PKG-INFO 2013-08-23 18:08:32.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 2.5.12 +Version: 2.5.14 Summary: Messaging Framework for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging Framework for Python ======================================== - :Version: 2.5.12 + :Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/README new/kombu-2.5.14/README --- old/kombu-2.5.12/README 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/README 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/README.rst new/kombu-2.5.14/README.rst --- old/kombu-2.5.12/README.rst 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/README.rst 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/changelog.rst new/kombu-2.5.14/docs/changelog.rst --- old/kombu-2.5.12/docs/changelog.rst 2013-06-28 16:26:59.000000000 +0200 +++ new/kombu-2.5.14/docs/changelog.rst 2013-08-23 18:05:37.000000000 +0200 @@ -4,6 +4,41 @@ Change history ================ +.. _version-2.5.14: + +2.5.14 +====== +:release-date: 2014-08-23 17:00 P.M BST + +- safe_str did not work properly resulting in + :exc:`UnicodeDecodeError` (Issue #248). + +.. _version-2.5.13: + +2.5.13 +====== +:release-date: 2013-08-16 16:00 P.M BST + +- Now depends on :mod:`amqp` 1.0.13 + +- Fixed typo in Django functional tests. + +- safe_str now returns Unicode in Python 2.x + + Fix contributed by Germán M. Bravo. + +- amqp: Transport options are now merged with arguments + supplied to the connection. + +- Tests no longer depends on distribute, which was deprecated + and merged back into setuptools. + + Fix contributed by Sascha Peilicke. + +- ConsumerMixin now also restarts on channel related errors. + + Fix contributed by Corentin Ardeois. + .. _version-2.5.12: 2.5.12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/introduction.rst new/kombu-2.5.14/docs/introduction.rst --- old/kombu-2.5.12/docs/introduction.rst 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/docs/introduction.rst 2013-08-23 17:10:06.000000000 +0200 @@ -4,7 +4,7 @@ kombu - Messaging Framework for Python ======================================== -:Version: 2.5.12 +:Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/docs/reference/kombu.rst new/kombu-2.5.14/docs/reference/kombu.rst --- old/kombu-2.5.12/docs/reference/kombu.rst 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/docs/reference/kombu.rst 2013-08-23 17:09:28.000000000 +0200 @@ -128,7 +128,7 @@ .. code-block:: python - >>> bound_sicence_news.declare() + >>> bound_science_news.declare() >>> bound_science_news.purge() >>> bound_science_news.delete() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/funtests/tests/test_django.py new/kombu-2.5.14/funtests/tests/test_django.py --- old/kombu-2.5.12/funtests/tests/test_django.py 2013-06-25 12:23:18.000000000 +0200 +++ new/kombu-2.5.14/funtests/tests/test_django.py 2013-08-16 16:39:53.000000000 +0200 @@ -29,7 +29,7 @@ 'NAME': ':memory:', }, }, - INSTALLED_APPS=('kombu.transports.django', ), + INSTALLED_APPS=('kombu.transport.django', ), ) from django.core.management import call_command call_command('syncdb') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/__init__.py new/kombu-2.5.14/kombu/__init__.py --- old/kombu-2.5.12/kombu/__init__.py 2013-06-28 16:27:11.000000000 +0200 +++ new/kombu-2.5.14/kombu/__init__.py 2013-08-23 17:09:56.000000000 +0200 @@ -1,7 +1,7 @@ """Messaging Framework for Python""" from __future__ import absolute_import -VERSION = (2, 5, 12) +VERSION = (2, 5, 14) __version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:]) __author__ = 'Ask Solem' __contact__ = 'a...@celeryproject.org' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/mixins.py new/kombu-2.5.14/kombu/mixins.py --- old/kombu-2.5.12/kombu/mixins.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/mixins.py 2013-08-23 17:09:28.000000000 +0200 @@ -13,6 +13,7 @@ from contextlib import contextmanager from functools import partial from itertools import count +from time import sleep from .common import ignore_errors from .messaging import Consumer @@ -158,13 +159,18 @@ def extra_context(self, connection, channel): yield - def run(self): + def run(self, _tokens=1): + restart_limit = self.restart_limit + errors = (self.connection.connection_errors + + self.connection.channel_errors) while not self.should_stop: try: - if self.restart_limit.can_consume(1): + if restart_limit.can_consume(_tokens): for _ in self.consume(limit=None): pass - except self.connection.connection_errors: + else: + sleep(restart_limit.expected_time(_tokens)) + except errors: warn('Connection to broker lost. ' 'Trying to re-establish the connection...') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/tests/test_serialization.py new/kombu-2.5.14/kombu/tests/test_serialization.py --- old/kombu-2.5.12/kombu/tests/test_serialization.py 2013-06-28 16:24:56.000000000 +0200 +++ new/kombu-2.5.14/kombu/tests/test_serialization.py 2013-08-23 17:09:28.000000000 +0200 @@ -55,8 +55,6 @@ msgpack_py_data = dict(py_data) -# msgpack only supports tuples -msgpack_py_data['list'] = tuple(msgpack_py_data['list']) # Unicode chars are lost in transmit :( msgpack_py_data['unicode'] = 'Th quick brown fox jumps over th lazy dog' msgpack_data = b64decode("""\ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/tests/utilities/test_encoding.py new/kombu-2.5.14/kombu/tests/utilities/test_encoding.py --- old/kombu-2.5.12/kombu/tests/utilities/test_encoding.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/tests/utilities/test_encoding.py 2013-08-23 18:04:17.000000000 +0200 @@ -8,7 +8,7 @@ from mock import patch from nose import SkipTest -from kombu.utils.encoding import safe_str +from kombu.utils.encoding import bytes_t, safe_str, default_encoding from kombu.tests.utils import TestCase @@ -26,16 +26,16 @@ class test_default_encoding(TestCase): - @patch('sys.getfilesystemencoding') - def test_default(self, getfilesystemencoding): - getfilesystemencoding.return_value = 'ascii' + @patch('sys.getdefaultencoding') + def test_default(self, getdefaultencoding): + getdefaultencoding.return_value = 'ascii' with clean_encoding() as encoding: enc = encoding.default_encoding() if sys.platform.startswith('java'): self.assertEqual(enc, 'utf-8') else: self.assertEqual(enc, 'ascii') - getfilesystemencoding.assert_called_with() + getdefaultencoding.assert_called_with() class test_encoding_utils(TestCase): @@ -60,16 +60,36 @@ class test_safe_str(TestCase): - def test_when_str(self): + def setUp(self): + self._cencoding = patch('sys.getdefaultencoding') + self._encoding = self._cencoding.__enter__() + self._encoding.return_value = 'ascii' + + def tearDown(self): + self._cencoding.__exit__() + + def test_when_bytes(self): self.assertEqual(safe_str('foo'), 'foo') def test_when_unicode(self): - self.assertIsInstance(safe_str(u'foo'), str) + self.assertIsInstance(safe_str(u'foo'), bytes_t) + + def test_when_encoding_utf8(self): + with patch('sys.getdefaultencoding') as encoding: + encoding.return_value = 'utf-8' + self.assertEqual(default_encoding(), 'utf-8') + s = u'The quiæk fåx jømps øver the lazy dåg' + res = safe_str(s) + self.assertIsInstance(res, bytes_t) + self.assertGreater(len(res), len(s)) def test_when_containing_high_chars(self): - s = u'The quiæk fåx jømps øver the lazy dåg' - res = safe_str(s) - self.assertIsInstance(res, str) + with patch('sys.getdefaultencoding') as encoding: + encoding.return_value = 'ascii' + s = u'The quiæk fåx jømps øver the lazy dåg' + res = safe_str(s) + self.assertIsInstance(res, bytes_t) + self.assertEqual(len(s), len(res)) def test_when_not_string(self): o = object() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/transport/librabbitmq.py new/kombu-2.5.14/kombu/transport/librabbitmq.py --- old/kombu-2.5.12/kombu/transport/librabbitmq.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/transport/librabbitmq.py 2013-08-23 17:09:28.000000000 +0200 @@ -105,15 +105,17 @@ setattr(conninfo, name, default_value) if conninfo.ssl: raise NotImplementedError(NO_SSL_ERROR) - conn = self.Connection(host=conninfo.host, - userid=conninfo.userid, - password=conninfo.password, - virtual_host=conninfo.virtual_host, - login_method=conninfo.login_method, - insist=conninfo.insist, - ssl=conninfo.ssl, - connect_timeout=conninfo.connect_timeout, - **conninfo.transport_options or {}) + opts = dict({ + 'host': conninfo.host, + 'userid': conninfo.userid, + 'password': conninfo.password, + 'virtual_host': conninfo.virtual_host, + 'login_method': conninfo.login_method, + 'insist': conninfo.insist, + 'ssl': conninfo.ssl, + 'connect_timeout': conninfo.connect_timeout, + }, **conninfo.transport_options or {}) + conn = self.Connection(**opts) conn.client = self.client self.client.drain_events = conn.drain_events return conn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/transport/pyamqp.py new/kombu-2.5.14/kombu/transport/pyamqp.py --- old/kombu-2.5.12/kombu/transport/pyamqp.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/transport/pyamqp.py 2013-08-23 17:09:28.000000000 +0200 @@ -75,14 +75,17 @@ channel_errors = (StdChannelError, ) + amqp.Connection.channel_errors nb_keep_draining = True - driver_name = "py-amqp" - driver_type = "amqp" + driver_name = 'py-amqp' + driver_type = 'amqp' supports_heartbeats = True supports_ev = True def __init__(self, client, **kwargs): self.client = client - self.default_port = kwargs.get("default_port") or self.default_port + self.default_port = kwargs.get('default_port') or self.default_port + + def driver_version(self): + return amqp.__version__ def create_channel(self, connection): return connection.channel() @@ -98,16 +101,18 @@ setattr(conninfo, name, default_value) if conninfo.hostname == 'localhost': conninfo.hostname = '127.0.0.1' - conn = self.Connection(host=conninfo.host, - userid=conninfo.userid, - password=conninfo.password, - login_method=conninfo.login_method, - virtual_host=conninfo.virtual_host, - insist=conninfo.insist, - ssl=conninfo.ssl, - connect_timeout=conninfo.connect_timeout, - heartbeat=conninfo.heartbeat, - **conninfo.transport_options or {}) + opts = dict({ + 'host': conninfo.host, + 'userid': conninfo.userid, + 'password': conninfo.password, + 'login_method': conninfo.login_method, + 'virtual_host': conninfo.virtual_host, + 'insist': conninfo.insist, + 'ssl': conninfo.ssl, + 'connect_timeout': conninfo.connect_timeout, + 'heartbeat': conninfo.heartbeat, + }, **conninfo.transport_options or {}) + conn = self.Connection(**opts) conn.client = self.client return conn diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu/utils/encoding.py new/kombu-2.5.14/kombu/utils/encoding.py --- old/kombu-2.5.12/kombu/utils/encoding.py 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/kombu/utils/encoding.py 2013-08-23 18:03:52.000000000 +0200 @@ -22,7 +22,7 @@ else: def default_encoding(): # noqa - return sys.getfilesystemencoding() + return sys.getdefaultencoding() if is_py3k: # pragma: no cover diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu.egg-info/PKG-INFO new/kombu-2.5.14/kombu.egg-info/PKG-INFO --- old/kombu-2.5.12/kombu.egg-info/PKG-INFO 2013-06-28 16:28:05.000000000 +0200 +++ new/kombu-2.5.14/kombu.egg-info/PKG-INFO 2013-08-23 18:08:25.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: kombu -Version: 2.5.12 +Version: 2.5.14 Summary: Messaging Framework for Python Home-page: http://kombu.readthedocs.org Author: Ask Solem @@ -12,7 +12,7 @@ kombu - Messaging Framework for Python ======================================== - :Version: 2.5.12 + :Version: 2.5.14 `Kombu` is a messaging framework for Python. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/kombu.egg-info/requires.txt new/kombu-2.5.14/kombu.egg-info/requires.txt --- old/kombu-2.5.12/kombu.egg-info/requires.txt 2013-06-28 16:28:05.000000000 +0200 +++ new/kombu-2.5.14/kombu.egg-info/requires.txt 2013-08-23 18:08:25.000000000 +0200 @@ -1,2 +1,2 @@ anyjson>=0.3.3 -amqp>=1.0.12,<1.1.0 \ No newline at end of file +amqp>=1.0.13,<1.1.0 \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/requirements/default.txt new/kombu-2.5.14/requirements/default.txt --- old/kombu-2.5.12/requirements/default.txt 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/requirements/default.txt 2013-08-23 17:09:28.000000000 +0200 @@ -1,2 +1,2 @@ anyjson>=0.3.3 -amqp>=1.0.12,<1.1.0 +amqp>=1.0.13,<1.1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kombu-2.5.12/requirements/test-py3k.txt new/kombu-2.5.14/requirements/test-py3k.txt --- old/kombu-2.5.12/requirements/test-py3k.txt 2013-06-28 16:11:26.000000000 +0200 +++ new/kombu-2.5.14/requirements/test-py3k.txt 2013-08-23 17:09:28.000000000 +0200 @@ -1,4 +1,4 @@ -distribute +setuptools>=0.7 nose nose-cover3 mock>=0.7.0 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
