22542988 Python 2.7.11 breaks Kombu
authorDrew Fisher <drew.fisher@oracle.com>
Wed, 13 Jan 2016 16:52:52 -0800
changeset 5269 df2b37609598
parent 5268 f322c1ffb1af
child 5270 00c5358f9f1d
22542988 Python 2.7.11 breaks Kombu
components/python/kombu/patches/01-python-2.7.11.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/kombu/patches/01-python-2.7.11.patch	Wed Jan 13 16:52:52 2016 -0800
@@ -0,0 +1,37 @@
+Upstream patch for 
+https://github.com/celery/kombu/issues/545
+
+This is fixed in Kombu 3.0.30 or newer.
+
+--- kombu-3.0.7/kombu/utils/__init__.py.orig 2013-11-09 16:53:13.000000000 -0800
++++ kombu-3.0.7/kombu/utils/__init__.py 2016-01-13 14:51:53.587003755 -0800
[email protected]@ -14,7 +14,11 @@ import sys
+ from contextlib import contextmanager
+ from itertools import count, repeat
+ from time import sleep
+-from uuid import UUID, uuid4 as _uuid4, _uuid_generate_random
++from uuid import UUID, uuid4
++try:
++    from uuid import _uuid_generate_random
++except ImportError:
++    _uuid_generate_random = None
+
+ from kombu.five import int_types, items, reraise, string_t
+
[email protected]@ -125,13 +129,12 @@ def say(m, *fargs, **fkwargs):
+     print(str(m).format(*fargs, **fkwargs), file=sys.stderr)
+
+
+-def uuid4():
+-    # Workaround for http://bugs.python.org/issue4607
+-    if ctypes and _uuid_generate_random:  # pragma: no cover
++if ctypes and _uuid_generate_random:  # pragma: no cover
++    def uuid4():
++        # Workaround for http://bugs.python.org/issue4607
+         buffer = ctypes.create_string_buffer(16)
+         _uuid_generate_random(buffer)
+         return UUID(bytes=buffer.raw)
+-    return _uuid4()
+
+
+ def uuid():