[Python-modules-commits] [celery] 01/01: Apply upstream patch to allow Sphinx to strip memory addresses

[Brian May]

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

bam pushed a commit to branch debian/master
in repository celery.

commit 68e234bb1add3886cd5a4395d64344f334322816
Author: Brian May <bam at debian.org>
Date:   Fri Jul 21 17:46:17 2017 +1000

    Apply upstream patch to allow Sphinx to strip memory addresses
---
 debian/changelog                                    |  2 ++
 ...-Make-appstr-use-standard-format-4134-4139.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b227b8..b695022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 celery (4.0.2-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+  * Apply upstream patch to allow Sphinx to strip memory addresses.
+    Closes: #868808.
 
  -- Brian May <bam at debian.org>  Tue, 04 Jul 2017 08:05:58 +1000
 
diff --git a/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch b/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch
new file mode 100644
index 0000000..46dbeb4
--- /dev/null
+++ b/debian/patches/0004-Make-appstr-use-standard-format-4134-4139.patch
@@ -0,0 +1,21 @@
+From: Preston Moore <prestonkmoore at gmail.com>
+Date: Tue, 18 Jul 2017 06:46:15 -0400
+Subject: Make appstr use standard format (#4134) (#4139)
+
+---
+ celery/app/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/celery/app/utils.py b/celery/app/utils.py
+index 75c88aa..32aaf44 100644
+--- a/celery/app/utils.py
++++ b/celery/app/utils.py
+@@ -70,7 +70,7 @@ FMT_REPLACE_SETTING = '{replace:<36} -> {with_}'
+ 
+ def appstr(app):
+     """String used in __repr__ etc, to id app instances."""
+-    return '{0}:{1:#x}'.format(app.main or '__main__', id(app))
++    return '{0} at {1:#x}'.format(app.main or '__main__', id(app))
+ 
+ 
+ class Settings(ConfigurationView):
diff --git a/debian/patches/series b/debian/patches/series
index d617195..4313fe2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 lsb-init.patch
 privacy.patch
 0007-Set-shell-in-su-invocation.patch
+0004-Make-appstr-use-standard-format-4134-4139.patch

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