Hello community,

here is the log from the commit of package python-kombu for openSUSE:Factory 
checked in at 2012-12-19 13:15:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-kombu (Old)
 and      /work/SRC/openSUSE:Factory/.python-kombu.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-kombu", Maintainer is "cth...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/python-kombu/python-kombu.changes        
2012-12-10 14:26:54.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.python-kombu.new/python-kombu.changes   
2012-12-19 13:15:05.000000000 +0100
@@ -1,0 +2,10 @@
+Mon Dec 10 17:35:21 UTC 2012 - alexan...@exatati.com.br
+
+- Update to 2.5.4:
+  - Fixed problem with connection clone and multiple URLs (Issue #182).
+    Fix contributed by Dane Guempel.
+- zeromq: Now compatible with libzmq 3.2.x.
+    Fix contributed by Andrey Antukh.
+- Fixed Python 3 installation problem (Issue #187).
+
+-------------------------------------------------------------------

Old:
----
  kombu-2.5.3.tar.gz

New:
----
  kombu-2.5.4.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-kombu.spec ++++++
--- /var/tmp/diff_new_pack.6F90TK/_old  2012-12-19 13:15:08.000000000 +0100
+++ /var/tmp/diff_new_pack.6F90TK/_new  2012-12-19 13:15:08.000000000 +0100
@@ -16,7 +16,7 @@
 #
 
 Name:           python-kombu
-Version:        2.5.3
+Version:        2.5.4
 Release:        0
 License:        BSD-2-Clause
 Summary:        AMQP Messaging Framework for Python

++++++ kombu-2.5.3.tar.gz -> kombu-2.5.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/AUTHORS new/kombu-2.5.4/AUTHORS
--- old/kombu-2.5.3/AUTHORS     2012-11-27 16:29:59.000000000 +0100
+++ new/kombu-2.5.4/AUTHORS     2012-12-10 16:45:06.000000000 +0100
@@ -7,6 +7,7 @@
 Adam Wentz
 Alexandre Bourget <alexandre.bour...@savoirfairelinux.com>
 Andrew Watts
+Andrey Antukh <n...@niwi.be>
 Andrii Kostenko <and...@kostenko.name>
 Andy McCurdy <a...@andymccurdy.com>
 Anton Gyllenberg <an...@iki.fi>
@@ -18,6 +19,7 @@
 Christopher Grebs <c...@webshox.org>
 Clay Gerrard <clay.gerr...@gmail.com>
 Dan McGee <d...@archlinux.org>
+Dane Guempel <daneguem...@gmail.com>
 David Clymer <da...@zettazebra.com>
 David Gelvin <david.gel...@gmail.com>
 David Strauss <da...@davidstrauss.net>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/Changelog new/kombu-2.5.4/Changelog
--- old/kombu-2.5.3/Changelog   2012-11-29 17:44:20.000000000 +0100
+++ new/kombu-2.5.4/Changelog   2012-12-10 16:53:43.000000000 +0100
@@ -4,6 +4,22 @@
  Change history
 ================
 
+.. _version-2.5.4:
+
+2.5.4
+=====
+:release-date: 2012-12-10 12:35 PM UTC
+
+- Fixed problem with connection clone and multiple URLs (Issue #182).
+
+    Fix contributed by Dane Guempel.
+
+- zeromq: Now compatible with libzmq 3.2.x.
+
+    Fix contributed by Andrey Antukh.
+
+- Fixed Python 3 installation problem (Issue #187).
+
 .. _version-2.5.3:
 
 2.5.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/PKG-INFO new/kombu-2.5.4/PKG-INFO
--- old/kombu-2.5.3/PKG-INFO    2012-11-29 17:45:09.000000000 +0100
+++ new/kombu-2.5.4/PKG-INFO    2012-12-10 16:55:28.000000000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: kombu
-Version: 2.5.3
+Version: 2.5.4
 Summary: Messaging Framework for Python
 Home-page: http://kombu.readthedocs.org
 Author: Ask Solem
@@ -10,7 +10,7 @@
          kombu - Messaging Framework for Python
         ========================================
         
-        :Version: 2.5.3
+        :Version: 2.5.4
         
         `Kombu` is a messaging framework for Python.
         
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/README new/kombu-2.5.4/README
--- old/kombu-2.5.3/README      2012-11-29 17:44:33.000000000 +0100
+++ new/kombu-2.5.4/README      2012-12-10 16:51:49.000000000 +0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.3
+:Version: 2.5.4
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/README.rst new/kombu-2.5.4/README.rst
--- old/kombu-2.5.3/README.rst  2012-11-29 17:44:33.000000000 +0100
+++ new/kombu-2.5.4/README.rst  2012-12-10 16:51:49.000000000 +0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.3
+:Version: 2.5.4
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/docs/changelog.rst 
new/kombu-2.5.4/docs/changelog.rst
--- old/kombu-2.5.3/docs/changelog.rst  2012-11-29 17:44:20.000000000 +0100
+++ new/kombu-2.5.4/docs/changelog.rst  2012-12-10 16:53:43.000000000 +0100
@@ -4,6 +4,22 @@
  Change history
 ================
 
+.. _version-2.5.4:
+
+2.5.4
+=====
+:release-date: 2012-12-10 12:35 PM UTC
+
+- Fixed problem with connection clone and multiple URLs (Issue #182).
+
+    Fix contributed by Dane Guempel.
+
+- zeromq: Now compatible with libzmq 3.2.x.
+
+    Fix contributed by Andrey Antukh.
+
+- Fixed Python 3 installation problem (Issue #187).
+
 .. _version-2.5.3:
 
 2.5.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/docs/introduction.rst 
new/kombu-2.5.4/docs/introduction.rst
--- old/kombu-2.5.3/docs/introduction.rst       2012-11-29 17:44:33.000000000 
+0100
+++ new/kombu-2.5.4/docs/introduction.rst       2012-12-10 16:51:49.000000000 
+0100
@@ -2,7 +2,7 @@
  kombu - Messaging Framework for Python
 ========================================
 
-:Version: 2.5.3
+:Version: 2.5.4
 
 `Kombu` is a messaging framework for Python.
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/docs/userguide/connections.rst 
new/kombu-2.5.4/docs/userguide/connections.rst
--- old/kombu-2.5.3/docs/userguide/connections.rst      2012-11-27 
16:29:59.000000000 +0100
+++ new/kombu-2.5.4/docs/userguide/connections.rst      2012-12-10 
16:44:07.000000000 +0100
@@ -27,7 +27,7 @@
 
 You can also check whether the connection is connected::
 
-    >>> connection.connected()
+    >>> connection.connected
     True
 
 Connections must always be closed after use::
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu/__init__.py 
new/kombu-2.5.4/kombu/__init__.py
--- old/kombu-2.5.3/kombu/__init__.py   2012-11-29 17:44:33.000000000 +0100
+++ new/kombu-2.5.4/kombu/__init__.py   2012-12-10 16:51:49.000000000 +0100
@@ -1,7 +1,7 @@
 """Messaging Framework for Python"""
 from __future__ import absolute_import
 
-VERSION = (2, 5, 3)
+VERSION = (2, 5, 4)
 __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.3/kombu/connection.py 
new/kombu-2.5.4/kombu/connection.py
--- old/kombu-2.5.3/kombu/connection.py 2012-11-27 17:00:04.000000000 +0100
+++ new/kombu-2.5.4/kombu/connection.py 2012-12-10 16:45:06.000000000 +0100
@@ -515,9 +515,14 @@
         if resolve:
             transport_cls = RESOLVE_ALIASES.get(transport_cls, transport_cls)
         D = self.transport.default_connection_params
-        hostname = self.hostname or D.get('hostname')
-        if self.uri_prefix:
-            hostname = '%s+%s' % (self.uri_prefix, hostname)
+
+        if self.alt:
+            hostname = ";".join(self.alt)
+        else:
+            hostname = self.hostname or D.get('hostname')
+            if self.uri_prefix:
+                hostname = '%s+%s' % (self.uri_prefix, hostname)
+
         info = (('hostname', hostname),
                 ('userid', self.userid or D.get('userid')),
                 ('password', self.password or D.get('password')),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu/tests/mocks.py 
new/kombu-2.5.4/kombu/tests/mocks.py
--- old/kombu-2.5.3/kombu/tests/mocks.py        2012-11-27 17:00:04.000000000 
+0100
+++ new/kombu-2.5.4/kombu/tests/mocks.py        2012-12-10 16:49:23.000000000 
+0100
@@ -22,7 +22,7 @@
 class Channel(base.StdChannel):
     open = True
     throw_decode_error = False
-    _ids = count(1)
+    _ids = count(1).next
 
     def __init__(self, connection):
         self.connection = connection
@@ -30,7 +30,7 @@
         self.deliveries = count(1).next
         self.to_deliver = []
         self.events = {'basic_return': set()}
-        self.channel_id = next(self._ids)
+        self.channel_id = self._ids()
 
     def _called(self, name):
         self.called.append(name)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu/tests/test_connection.py 
new/kombu-2.5.4/kombu/tests/test_connection.py
--- old/kombu-2.5.3/kombu/tests/test_connection.py      2012-11-27 
17:00:04.000000000 +0100
+++ new/kombu-2.5.4/kombu/tests/test_connection.py      2012-12-10 
16:48:28.000000000 +0100
@@ -291,7 +291,7 @@
         c.maybe_switch_next()
         self.assertFalse(c._closed)
         self.assertEqual(c.hostname, 'foo')
-        self.assertIn(c.transport_cls, ('librabbitmq', 'pyamqp'))
+        self.assertIn(c.transport_cls, ('librabbitmq', 'pyamqp', 'amqp'))
 
     def test_heartbeat_check(self):
         c = Connection(transport=Transport)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu/tests/utils.py 
new/kombu-2.5.4/kombu/tests/utils.py
--- old/kombu-2.5.3/kombu/tests/utils.py        2012-11-27 17:00:04.000000000 
+0100
+++ new/kombu-2.5.4/kombu/tests/utils.py        2012-12-10 16:51:20.000000000 
+0100
@@ -91,24 +91,6 @@
 # Taken from
 # http://bitbucket.org/runeh/snippets/src/tip/missing_modules.py
 def mask_modules(*modnames):
-    """Ban some modules from being importable inside the context
-
-    For example:
-
-        >>> @missing_modules('sys'):
-        >>> def foo():
-        ...     try:
-        ...         import sys
-        ...     except ImportError:
-        ...         print('sys not found')
-        sys not found
-
-        >>> import sys
-        >>> sys.version
-        (2, 5, 2, 'final', 0)
-
-    """
-
     def _inner(fun):
 
         @wraps(fun)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu/transport/zmq.py 
new/kombu-2.5.4/kombu/transport/zmq.py
--- old/kombu-2.5.3/kombu/transport/zmq.py      2012-11-27 17:00:04.000000000 
+0100
+++ new/kombu-2.5.4/kombu/transport/zmq.py      2012-12-10 16:45:07.000000000 
+0100
@@ -111,7 +111,12 @@
             self.sink = None
 
         self.vent = self.context.socket(zmq.PUSH)
-        self.vent.setsockopt(zmq.HWM, hwm)
+
+        if hasattr(zmq, 'SNDHWM'):
+            self.vent.setsockopt(zmq.SNDHWM, hwm)
+        else:
+            self.vent.setsockopt(zmq.HWM, hwm)
+
         if swap_size:
             self.vent.setsockopt(zmq.SWAP, swap_size)
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/kombu-2.5.3/kombu.egg-info/PKG-INFO 
new/kombu-2.5.4/kombu.egg-info/PKG-INFO
--- old/kombu-2.5.3/kombu.egg-info/PKG-INFO     2012-11-29 17:45:02.000000000 
+0100
+++ new/kombu-2.5.4/kombu.egg-info/PKG-INFO     2012-12-10 16:55:13.000000000 
+0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: kombu
-Version: 2.5.3
+Version: 2.5.4
 Summary: Messaging Framework for Python
 Home-page: http://kombu.readthedocs.org
 Author: Ask Solem
@@ -10,7 +10,7 @@
          kombu - Messaging Framework for Python
         ========================================
         
-        :Version: 2.5.3
+        :Version: 2.5.4
         
         `Kombu` is a messaging framework for Python.
         

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to