[Python-modules-commits] [python-amqp] 01/12: Convert from git-dpm to patches unapplied format

[Christopher Stuart Hoskin]

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

mans0954 pushed a commit to branch debian/experimental
in repository python-amqp.

commit 5afdf1655c9f64d873a340b6bd6ef96d6aa20605
Author: Christopher Hoskin <mans0954 at debian.org>
Date:   Wed Mar 15 19:42:03 2017 +0000

    Convert from git-dpm to patches unapplied format
---
 amqp/channel.py | 3 +++
 amqp/utils.py   | 2 +-
 debian/.git-dpm | 8 --------
 debian/gbp.conf | 2 ++
 docs/conf.py    | 8 +++++---
 5 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/amqp/channel.py b/amqp/channel.py
index 0d4897e..ff6a4ae 100644
--- a/amqp/channel.py
+++ b/amqp/channel.py
@@ -614,6 +614,9 @@ 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 --git a/amqp/utils.py b/amqp/utils.py
index bd74011..900d2aa 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:
diff --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index ab80095..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,8 +0,0 @@
-# see git-dpm(1) from git-dpm package
-50d9763b0bd213efc79e0633139a555e4c933682
-50d9763b0bd213efc79e0633139a555e4c933682
-cffa3b54a58deb0770a73c48c03d1c81fbd6fab3
-cffa3b54a58deb0770a73c48c03d1c81fbd6fab3
-python-amqp_1.4.9.orig.tar.gz
-574f0e599ee7c1a42d9738bcb7e34db125f339d9
-79392
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..6909332
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,2 @@
+[DEFAULT]
+debian-branch=debian/experimental
diff --git a/docs/conf.py b/docs/conf.py
index 567f509..1191395 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,7 +18,8 @@ import amqp
 extensions = ['sphinx.ext.autodoc',
               'sphinx.ext.coverage',
               'sphinx.ext.pngmath',
-              'sphinx.ext.intersphinx']
+              'sphinx.ext.intersphinx',
+              'sphinxcontrib.issuetracker']
 
 html_show_sphinx = False
 
@@ -76,8 +77,9 @@ latex_documents = [
 html_theme = "celery"
 html_theme_path = ["_theme"]
 html_sidebars = {
-    'index': ['sourcelink.html', 'searchbox.html'],
-    '**': ['relations.html', 'sourcelink.html', 'searchbox.html'],
+    'index': ['sidebarintro.html', 'sourcelink.html', 'searchbox.html'],
+    '**': ['sidebarlogo.html', 'relations.html',
+           'sourcelink.html', 'searchbox.html'],
 }
 
 ### Issuetracker

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