[Python-modules-commits] [kombu] 02/03: merge patched into master

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch master
in repository kombu.

commit db39a25ffebffd132db716ec707a8542f2268c8d
Merge: 2dbdf12 77024a2
Author: Brian May <bam at debian.org>
Date:   Sun Nov 29 09:34:08 2015 +1100

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...02-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 kombu/utils/__init__.py                            | 13 +++---
 4 files changed, 62 insertions(+), 7 deletions(-)

diff --cc debian/.git-dpm
index 251db36,0000000..57fdc81
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 722911416a2f22668c4040661b65aa880f60e3c4
- 722911416a2f22668c4040661b65aa880f60e3c4
++77024a20a3f3f5732116bebe5be0980dd7352310
++77024a20a3f3f5732116bebe5be0980dd7352310
 +d36ec12315555e6fa413edaf2d3c5428cac73dcd
 +d36ec12315555e6fa413edaf2d3c5428cac73dcd
 +kombu_3.0.29.orig.tar.gz
 +d97cbfcde6d7b8dea5f9b5044d4696c4b79d24f7
 +378270
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0002-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch
index 0000000,0000000..6ae9fb6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0002-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch
@@@ -1,0 -1,0 +1,51 @@@
++From 77024a20a3f3f5732116bebe5be0980dd7352310 Mon Sep 17 00:00:00 2001
++From: Kai Groner <kai at gronr.com>
++Date: Tue, 17 Nov 2015 13:15:16 -0500
++Subject: Fix uuid shim in upcoming Python 3.5.1.
++
++After a recent change in cpython, uuid._uuid_generate_random() no longer
++exists.
++
++https://hg.python.org/cpython/rev/70be1f9c9255
++http://bugs.python.org/issue25515
++
++The issue being worked around was resolved in 2007, so it might be
++sensible to just remove the work around.
++---
++ kombu/utils/__init__.py | 13 ++++++++-----
++ 1 file changed, 8 insertions(+), 5 deletions(-)
++
++diff --git a/kombu/utils/__init__.py b/kombu/utils/__init__.py
++index 0745ddf..76779b0 100644
++--- a/kombu/utils/__init__.py
+++++ b/kombu/utils/__init__.py
++@@ -16,7 +16,11 @@ from contextlib import contextmanager
++ from itertools import count, repeat
++ from functools import wraps
++ 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 items, reraise, string_t
++ 
++@@ -140,13 +144,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():
diff --cc debian/patches/series
index f9a10c3,0000000..3988314
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,1 -1,0 +1,2 @@@
 +remove_logo.patch
++0002-Fix-uuid-shim-in-upcoming-Python-3.5.1.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/kombu.git