[Python-modules-commits] [python-amqp] 07/08: merge patched into master
Brian May
bam at moszumanska.debian.org
Mon Jan 18 07:55:20 UTC 2016
This is an automated email from the git hooks/post-receive script.
bam pushed a commit to branch master
in repository python-amqp.
commit 86d054650c2d96f65250a89bbeb11a257bbda537
Merge: 32fb415 50d9763
Author: Brian May <bam at debian.org>
Date: Mon Jan 18 18:38:30 2016 +1100
merge patched into master
Changelog | 11 +++++++++++
PKG-INFO | 4 ++--
README.rst | 2 +-
amqp.egg-info/PKG-INFO | 4 ++--
amqp/__init__.py | 2 +-
amqp/five.py | 9 ++++++---
debian/.git-dpm | 6 +++---
.../0001-Remove-github-hosted-logo-from-documentation.patch | 2 +-
debian/patches/0002-Removes-deprecation-warning.patch | 2 +-
.../0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch | 2 +-
debian/patches/0004-Fixed-Python-3-syntax-error.patch | 2 +-
docs/changelog.rst | 11 +++++++++++
12 files changed, 41 insertions(+), 16 deletions(-)
diff --cc debian/.git-dpm
index 939fac9,0000000..ab80095
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
+# see git-dpm(1) from git-dpm package
- ea44383e4cde788f2bfa127ab4e7e76bca73a0f9
- ea44383e4cde788f2bfa127ab4e7e76bca73a0f9
- 8abdd0d0e51d9386b644c51df8804f7a7cebb1ce
++50d9763b0bd213efc79e0633139a555e4c933682
++50d9763b0bd213efc79e0633139a555e4c933682
++cffa3b54a58deb0770a73c48c03d1c81fbd6fab3
+cffa3b54a58deb0770a73c48c03d1c81fbd6fab3
+python-amqp_1.4.9.orig.tar.gz
+574f0e599ee7c1a42d9738bcb7e34db125f339d9
+79392
diff --cc debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch
index f2e8a19,0000000..cae89f0
mode 100644,000000..100644
--- a/debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch
+++ b/debian/patches/0001-Remove-github-hosted-logo-from-documentation.patch
@@@ -1,27 -1,0 +1,27 @@@
- From c4188397dd66b3cab27a1e9ce7fcefb9577baff6 Mon Sep 17 00:00:00 2001
++From 744497b42ea44f82a524eefc3cdda8f8b8b3644b Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 11:06:34 -0700
+Subject: Remove github-hosted logo from documentation
+
+Last-Update: 2014-04-08
+Forwarded: not-needed
+---
+ docs/conf.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 1191395..623efea 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -77,9 +77,8 @@ latex_documents = [
+ html_theme = "celery"
+ html_theme_path = ["_theme"]
+ html_sidebars = {
+- 'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
+- '**': ['sidebarlogo.html', 'relations.html',
+- 'sourcelink.html', 'searchbox.html'],
++ 'index': ['sourcelink.html', 'searchbox.html'],
++ '**': ['relations.html', 'sourcelink.html', 'searchbox.html'],
+ }
+
+ ### Issuetracker
diff --cc debian/patches/0002-Removes-deprecation-warning.patch
index 386f237,0000000..34b04aa
mode 100644,000000..100644
--- a/debian/patches/0002-Removes-deprecation-warning.patch
+++ b/debian/patches/0002-Removes-deprecation-warning.patch
@@@ -1,29 -1,0 +1,29 @@@
- From 976d0deecb8ddbdae7b14f66e1590f1063d21165 Mon Sep 17 00:00:00 2001
++From fb734494eea47b850974de8912e29d0987b5344c Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Thu, 8 Oct 2015 11:06:35 -0700
+Subject: Removes deprecation warning
+
+ The depraction warning is flooding Nova logs. As it's too late to fix Nova,
+ best way forward is to just remove the depraction warning, which this patch
+ does.
+Bug-Debian: https://bugs.debian.org/774966
+Forwarded: not-needed
+Last-Update: 2014-01-17
+---
+ amqp/channel.py | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/amqp/channel.py b/amqp/channel.py
+index ff6a4ae..0d4897e 100644
+--- a/amqp/channel.py
++++ b/amqp/channel.py
+@@ -614,9 +614,6 @@ class Channel(AbstractChannel):
+ args.write_table(arguments)
+ self._send_method((40, 10), args)
+
+- if auto_delete:
+- warn(VDeprecationWarning(EXCHANGE_AUTODELETE_DEPRECATED))
+-
+ if not nowait:
+ return self.wait(allowed_methods=[
+ (40, 11), # Channel.exchange_declare_ok
diff --cc debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
index 9f42611,0000000..34b6057
mode 100644,000000..100644
--- a/debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
+++ b/debian/patches/0003-Drop-dependency-on-sphinxcontrib.issuetracker.patch
@@@ -1,24 -1,0 +1,24 @@@
- From e369ff4666491ef0f4fbae77bf025390124780ef Mon Sep 17 00:00:00 2001
++From 5d790c73ab41ba416bd1001fa0ccad529a5cb627 Mon Sep 17 00:00:00 2001
+From: Michael Fladischer <fladi at debian.org>
+Date: Thu, 8 Oct 2015 11:06:36 -0700
+Subject: Drop dependency on sphinxcontrib.issuetracker
+
+Last-Update: 2015-04-02
+---
+ docs/conf.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index 623efea..567f509 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -18,8 +18,7 @@ import amqp
+ extensions = ['sphinx.ext.autodoc',
+ 'sphinx.ext.coverage',
+ 'sphinx.ext.pngmath',
+- 'sphinx.ext.intersphinx',
+- 'sphinxcontrib.issuetracker']
++ 'sphinx.ext.intersphinx']
+
+ html_show_sphinx = False
+
diff --cc debian/patches/0004-Fixed-Python-3-syntax-error.patch
index a0ca921,0000000..da84a82
mode 100644,000000..100644
--- a/debian/patches/0004-Fixed-Python-3-syntax-error.patch
+++ b/debian/patches/0004-Fixed-Python-3-syntax-error.patch
@@@ -1,26 -1,0 +1,26 @@@
- From ea44383e4cde788f2bfa127ab4e7e76bca73a0f9 Mon Sep 17 00:00:00 2001
++From 50d9763b0bd213efc79e0633139a555e4c933682 Mon Sep 17 00:00:00 2001
+From: Thomas Goirand <zigo at debian.org>
+Date: Thu, 8 Oct 2015 11:06:37 -0700
+Subject: Fixed Python 3 syntax error
+
+ Note: no need to forward this upstream as the code in this file has gone from
+ the master branch.
+Forwarded: no
+Last-Update: 2015-06-19
+---
+ amqp/utils.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/amqp/utils.py b/amqp/utils.py
+index 900d2aa..bd74011 100644
+--- a/amqp/utils.py
++++ b/amqp/utils.py
+@@ -35,7 +35,7 @@ class promise(object):
+ def __call__(self, *args, **kwargs):
+ try:
+ self.value = self.fun(
+- *self.args + args if self.args else args,
++ *(self.args + args if self.args else args),
+ **dict(self.kwargs, **kwargs) if self.kwargs else kwargs
+ )
+ except Exception as exc:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-amqp.git
More information about the Python-modules-commits
mailing list