This is an automated email from the ASF dual-hosted git repository. astitcher pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
commit 3d4a8c00fc9482ea3188194ec8c2b1cf50d5ce5c Author: Andrew Stitcher <astitc...@apache.org> AuthorDate: Thu Feb 20 17:19:39 2025 -0500 PROTON-2873: Used transaction disposition in python --- python/proton/_reactor.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/python/proton/_reactor.py b/python/proton/_reactor.py index 04ff2aac2..d57543a45 100644 --- a/python/proton/_reactor.py +++ b/python/proton/_reactor.py @@ -23,7 +23,7 @@ import logging import re import os import queue -from typing import Any, Dict, Iterator, Optional, List, Literal, Union, Callable, TYPE_CHECKING, Tuple, Type +from typing import Any, Callable, Dict, Iterator, List, Literal, Optional, Union, TYPE_CHECKING, Tuple, Type import time import traceback @@ -33,7 +33,7 @@ from functools import total_ordering from cproton import PN_ACCEPTED, PN_EVENT_NONE from ._data import Described, symbol, ulong -from ._delivery import Delivery, CustomDisposition +from ._delivery import Delivery, TransactionalDisposition from ._endpoints import Connection, Endpoint, Link, Session, Terminus from ._events import Collector, EventType, EventBase, Event from ._exceptions import SSLUnavailable @@ -558,11 +558,11 @@ class Transaction(object): self.discharge(True) def declare(self) -> None: - self._declare = self._send_ctrl(symbol(u'amqp:declare:list'), [None]) + self._declare = self._send_ctrl(symbol('amqp:declare:list'), [None]) def discharge(self, failed: bool) -> None: self.failed = failed - self._discharge = self._send_ctrl(symbol(u'amqp:discharge:list'), [self.id, failed]) + self._discharge = self._send_ctrl(symbol('amqp:discharge:list'), [self.id, failed]) def _send_ctrl(self, descriptor: 'PythonAMQPData', value: 'PythonAMQPData') -> Delivery: delivery = self.txn_ctrl.send(Message(body=Described(descriptor, value))) @@ -584,7 +584,7 @@ class Transaction(object): :return: Delivery object for this message. """ dlv = sender.send(msg, tag=tag) - dlv.local = CustomDisposition(0x34, [self.id]) + dlv.local = TransactionalDisposition(self.id) dlv.update() return dlv @@ -602,7 +602,7 @@ class Transaction(object): def update(self, delivery: Delivery, state: Optional[ulong] = None) -> None: if state: - delivery.local = GeneralDisposition(0x34, [self.id, Described(ulong(state), [])]) + delivery.local = TransactionalDisposition(self.id, state) delivery.update() def _release_pending(self): --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org For additional commands, e-mail: commits-h...@qpid.apache.org