You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2018/02/21 15:41:42 UTC

qpid-proton git commit: PROTON-1763: Relocate this comment to the right place

Repository: qpid-proton
Updated Branches:
  refs/heads/master b6b3dd612 -> 40748d240


PROTON-1763: Relocate this comment to the right place


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/40748d24
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/40748d24
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/40748d24

Branch: refs/heads/master
Commit: 40748d240d3a5c1dc6403ad9b7d8b15f36a9f363
Parents: b6b3dd6
Author: Justin Ross <jr...@apache.org>
Authored: Wed Feb 21 07:40:30 2018 -0800
Committer: Justin Ross <jr...@apache.org>
Committed: Wed Feb 21 07:40:30 2018 -0800

----------------------------------------------------------------------
 proton-c/bindings/python/proton/handlers.py | 3 +++
 proton-c/bindings/python/proton/reactor.py  | 7 -------
 2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/40748d24/proton-c/bindings/python/proton/handlers.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/handlers.py b/proton-c/bindings/python/proton/handlers.py
index 8ecf6da..76c9e51 100644
--- a/proton-c/bindings/python/proton/handlers.py
+++ b/proton-c/bindings/python/proton/handlers.py
@@ -116,6 +116,9 @@ class Acking(object):
     def accept(self, delivery):
         """
         Accepts a received message.
+
+        Note that this method cannot currently be used in combination
+        with transactions.
         """
         self.settle(delivery, Delivery.ACCEPTED)
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/40748d24/proton-c/bindings/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py
index ff4196d..0fa1c4b 100644
--- a/proton-c/bindings/python/proton/reactor.py
+++ b/proton-c/bindings/python/proton/reactor.py
@@ -363,13 +363,6 @@ class Transaction(object):
         return dlv
 
     def accept(self, delivery):
-        """
-        Accept the message corresponding to this delivery.
-
-        Note that this method cannot currently be used in combination
-        with transactions.
-        """
-
         self.update(delivery, PN_ACCEPTED)
         if self.settle_before_discharge:
             delivery.settle()


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org