[Python-modules-commits] [python-amqp] 07/15: Import python-amqp_1.4.8.orig.tar.gz
Michael Fladischer
fladi at moszumanska.debian.org
Sat Dec 19 17:55:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
fladi pushed a commit to branch master
in repository python-amqp.
commit 8abdd0d0e51d9386b644c51df8804f7a7cebb1ce
Author: Michael Fladischer <FladischerMichael at fladi.at>
Date: Fri Dec 18 10:20:40 2015 +0100
Import python-amqp_1.4.8.orig.tar.gz
---
Changelog | 12 ++++++++++++
PKG-INFO | 4 ++--
README.rst | 2 +-
amqp.egg-info/PKG-INFO | 4 ++--
amqp/__init__.py | 2 +-
amqp/abstract_channel.py | 4 ++--
amqp/connection.py | 9 +++++----
docs/changelog.rst | 12 ++++++++++++
8 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/Changelog b/Changelog
index 681c5d2..b4caae6 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,18 @@ py-amqp is fork of amqplib used by Kombu containing additional features and impr
The previous amqplib changelog is here:
http://code.google.com/p/py-amqplib/source/browse/CHANGES
+.. _version-1.4.8:
+
+1.4.8
+=====
+:release-date: 2015-12-07 12:25 AM
+:release-by: Ask Solem
+
+- ``abstract_channel.wait`` now accepts a float `timeout` parameter expressed
+ in seconds
+
+ Contributed by Goir.
+
.. _version-1.4.7:
1.4.7
diff --git a/PKG-INFO b/PKG-INFO
index 5b650f4..6d27649 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: amqp
-Version: 1.4.7
+Version: 1.4.8
Summary: Low-level AMQP client for Python (fork of amqplib)
Home-page: http://github.com/celery/py-amqp
Author: Ask Solem
@@ -10,7 +10,7 @@ Description: ===================================================================
Python AMQP 0.9.1 client library
=====================================================================
- :Version: 1.4.7
+ :Version: 1.4.8
:Web: http://amqp.readthedocs.org/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
diff --git a/README.rst b/README.rst
index b026c7e..1562d1e 100644
--- a/README.rst
+++ b/README.rst
@@ -2,7 +2,7 @@
Python AMQP 0.9.1 client library
=====================================================================
-:Version: 1.4.7
+:Version: 1.4.8
:Web: http://amqp.readthedocs.org/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
diff --git a/amqp.egg-info/PKG-INFO b/amqp.egg-info/PKG-INFO
index 5b650f4..6d27649 100644
--- a/amqp.egg-info/PKG-INFO
+++ b/amqp.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: amqp
-Version: 1.4.7
+Version: 1.4.8
Summary: Low-level AMQP client for Python (fork of amqplib)
Home-page: http://github.com/celery/py-amqp
Author: Ask Solem
@@ -10,7 +10,7 @@ Description: ===================================================================
Python AMQP 0.9.1 client library
=====================================================================
- :Version: 1.4.7
+ :Version: 1.4.8
:Web: http://amqp.readthedocs.org/
:Download: http://pypi.python.org/pypi/amqp/
:Source: http://github.com/celery/py-amqp/
diff --git a/amqp/__init__.py b/amqp/__init__.py
index a77bd9f..20cc4f5 100644
--- a/amqp/__init__.py
+++ b/amqp/__init__.py
@@ -16,7 +16,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
from __future__ import absolute_import
-VERSION = (1, 4, 7)
+VERSION = (1, 4, 8)
__version__ = '.'.join(map(str, VERSION[0:3])) + ''.join(VERSION[3:])
__author__ = 'Barry Pederson'
__maintainer__ = 'Ask Solem'
diff --git a/amqp/abstract_channel.py b/amqp/abstract_channel.py
index 28cfe13..62fca89 100644
--- a/amqp/abstract_channel.py
+++ b/amqp/abstract_channel.py
@@ -60,11 +60,11 @@ class AbstractChannel(object):
"""Close this Channel or Connection"""
raise NotImplementedError('Must be overriden in subclass')
- def wait(self, allowed_methods=None):
+ def wait(self, allowed_methods=None, timeout=None):
"""Wait for a method that matches our allowed_methods parameter (the
default value of None means match any method), and dispatch to it."""
method_sig, args, content = self.connection._wait_method(
- self.channel_id, allowed_methods)
+ self.channel_id, allowed_methods, timeout)
return self.dispatch_method(method_sig, args, content)
diff --git a/amqp/connection.py b/amqp/connection.py
index 88e1fc1..6988f85 100644
--- a/amqp/connection.py
+++ b/amqp/connection.py
@@ -216,7 +216,7 @@ class Connection(AbstractChannel):
raise ConnectionError(
'Channel %r already open' % (channel_id, ))
- def _wait_method(self, channel_id, allowed_methods):
+ def _wait_method(self, channel_id, allowed_methods, timeout=None):
"""Wait for a method from the server destined for
a particular channel."""
#
@@ -235,9 +235,10 @@ class Connection(AbstractChannel):
#
# Nothing queued, need to wait for a method from the peer
#
+ read_timeout = self.read_timeout
+ wait = self.wait
while 1:
- channel, method_sig, args, content = \
- self.method_reader.read_method()
+ channel, method_sig, args, content = read_timeout(timeout)
if channel == channel_id and (
allowed_methods is None or
@@ -270,7 +271,7 @@ class Connection(AbstractChannel):
# error, so deal with it right away.
#
if not channel:
- self.wait()
+ wait()
def channel(self, channel_id=None):
"""Fetch a Channel object identified by the numeric channel_id, or
diff --git a/docs/changelog.rst b/docs/changelog.rst
index 681c5d2..b4caae6 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,18 @@ py-amqp is fork of amqplib used by Kombu containing additional features and impr
The previous amqplib changelog is here:
http://code.google.com/p/py-amqplib/source/browse/CHANGES
+.. _version-1.4.8:
+
+1.4.8
+=====
+:release-date: 2015-12-07 12:25 AM
+:release-by: Ask Solem
+
+- ``abstract_channel.wait`` now accepts a float `timeout` parameter expressed
+ in seconds
+
+ Contributed by Goir.
+
.. _version-1.4.7:
1.4.7
--
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