You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gs...@apache.org on 2015/03/03 14:45:13 UTC
[1/2] qpid-proton git commit: NO-JIRA: Fix a couple of example
scenarios in line with recent change to sync_client.py
Repository: qpid-proton
Updated Branches:
refs/heads/master 89b0f3e16 -> 8ea52ddd3
NO-JIRA: Fix a couple of example scenarios in line with recent change to sync_client.py
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/fca40c5e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/fca40c5e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/fca40c5e
Branch: refs/heads/master
Commit: fca40c5ed01a0be88ae54b9b66faa999d6f5615d
Parents: 89b0f3e
Author: Gordon Sim <gs...@redhat.com>
Authored: Tue Mar 3 13:39:24 2015 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Tue Mar 3 13:46:26 2015 +0000
----------------------------------------------------------------------
examples/python/server_tx.py | 3 ++-
examples/python/test_examples.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fca40c5e/examples/python/server_tx.py
----------------------------------------------------------------------
diff --git a/examples/python/server_tx.py b/examples/python/server_tx.py
index 4a245e2..96b83cb 100755
--- a/examples/python/server_tx.py
+++ b/examples/python/server_tx.py
@@ -62,7 +62,8 @@ class TxServer(MessagingHandler):
sender = self.container.create_sender(self.conn, event.message.reply_to)
self.senders[event.message.reply_to] = sender
- response = Message(address=event.message.reply_to, body=event.message.body.upper())
+ response = Message(address=event.message.reply_to, body=event.message.body.upper(),
+ correlation_id=event.message.correlation_id)
self.container.declare_transaction(self.conn, handler=TxRequest(response, sender, event.delivery))
def on_connection_open(self, event):
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/fca40c5e/examples/python/test_examples.py
----------------------------------------------------------------------
diff --git a/examples/python/test_examples.py b/examples/python/test_examples.py
index b46b85b..49abb8a 100644
--- a/examples/python/test_examples.py
+++ b/examples/python/test_examples.py
@@ -77,7 +77,7 @@ class ExamplesTest(unittest.TestCase):
self.test_client_server(client=['client.py', '-a', 'localhost:8888/examples'], server=['server_direct.py'], sleep=0.5)
def test_sync_client_server_direct(self):
- self.test_client_server(client=['sync_client.py', 'localhost:8888/examples'], server=['server_direct.py'], sleep=0.5)
+ self.test_client_server(client=['sync_client.py', '-a', 'localhost:8888/examples'], server=['server_direct.py'], sleep=0.5)
def test_db_send_recv(self):
self.maxDiff = None
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: PROTON-831: minor tweak to accomodate
older python; patch from Irina Boverman.
Posted by gs...@apache.org.
PROTON-831: minor tweak to accomodate older python; patch from Irina Boverman.
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/8ea52ddd
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/8ea52ddd
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/8ea52ddd
Branch: refs/heads/master
Commit: 8ea52ddd32e340eb4d1125e30bc3b1208527f17a
Parents: fca40c5
Author: Gordon Sim <gs...@redhat.com>
Authored: Tue Mar 3 13:45:40 2015 +0000
Committer: Gordon Sim <gs...@redhat.com>
Committed: Tue Mar 3 13:46:36 2015 +0000
----------------------------------------------------------------------
proton-c/bindings/python/proton/__init__.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/8ea52ddd/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index ac2c15e..c200e9c 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -2855,7 +2855,7 @@ class Sender(Link):
yield str(count)
count += 1
self.tag_generator = simple_tags()
- return next(self.tag_generator)
+ return self.tag_generator.next()
class Receiver(Link):
"""
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org