This is an automated email from the ASF dual-hosted git repository.

jdanek pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/qpid-python.git


The following commit(s) were added to refs/heads/main by this push:
     new ee50491  QPID-8631: remove the `L` literal suffix from `long`s (#10)
ee50491 is described below

commit ee50491f65b8ae90f296874a87a6180ff7a984f1
Author: Jiri Daněk <jda...@redhat.com>
AuthorDate: Mon Apr 10 22:14:19 2023 +0200

    QPID-8631: remove the `L` literal suffix from `long`s (#10)
    
    This suffix is meaningless in Python 2.2+ and it is forbidden in Python 3.
    
    See https://peps.python.org/pep-0237/ for details.
---
 qpid/datatypes.py                            |  6 +-
 qpid/management.py                           |  8 +--
 qpid/messaging/constants.py                  |  2 +-
 qpid/peer.py                                 |  2 +-
 qpid/session.py                              |  2 +-
 qpid/testlib.py                              |  8 +--
 qpid/tests/codec.py                          |  8 +--
 qpid/tests/datatypes.py                      | 10 +--
 qpid/tests/spec010.py                        |  2 +-
 qpid_tests/broker_0_10/alternate_exchange.py | 22 +++----
 qpid_tests/broker_0_10/broker.py             | 16 ++---
 qpid_tests/broker_0_10/dtx.py                |  6 +-
 qpid_tests/broker_0_10/example.py            |  4 +-
 qpid_tests/broker_0_10/exchange.py           |  4 +-
 qpid_tests/broker_0_10/management.py         |  4 +-
 qpid_tests/broker_0_10/message.py            | 98 ++++++++++++++--------------
 qpid_tests/broker_0_10/persistence.py        |  2 +-
 qpid_tests/broker_0_10/queue.py              | 16 ++---
 qpid_tests/broker_0_10/tx.py                 |  8 +--
 qpid_tests/broker_1_0/tx.py                  |  8 +--
 20 files changed, 118 insertions(+), 118 deletions(-)

diff --git a/qpid/datatypes.py b/qpid/datatypes.py
index ca1466c..985fc3a 100644
--- a/qpid/datatypes.py
+++ b/qpid/datatypes.py
@@ -126,7 +126,7 @@ def serial(o):
 class Serial:
 
   def __init__(self, value):
-    self.value = value & 0xFFFFFFFFL
+    self.value = value & 0xFFFFFFFF
 
   def __hash__(self):
     return hash(self.value)
@@ -137,8 +137,8 @@ class Serial:
 
     other = serial(other)
 
-    delta = (self.value - other.value) & 0xFFFFFFFFL
-    neg = delta & 0x80000000L
+    delta = (self.value - other.value) & 0xFFFFFFFF
+    neg = delta & 0x80000000
     mag = delta & 0x7FFFFFFF
 
     if neg:
diff --git a/qpid/management.py b/qpid/management.py
index 3de8da9..2e76436 100644
--- a/qpid/management.py
+++ b/qpid/management.py
@@ -177,12 +177,12 @@ class managementChannel:
     ssn.incoming ("rdest").listen (self.replyCb)
 
     ssn.message_set_flow_mode (destination="tdest", flow_mode=1)
-    ssn.message_flow (destination="tdest", unit=0, value=0xFFFFFFFFL)
-    ssn.message_flow (destination="tdest", unit=1, value=0xFFFFFFFFL)
+    ssn.message_flow (destination="tdest", unit=0, value=0xFFFFFFFF)
+    ssn.message_flow (destination="tdest", unit=1, value=0xFFFFFFFF)
 
     ssn.message_set_flow_mode (destination="rdest", flow_mode=1)
-    ssn.message_flow (destination="rdest", unit=0, value=0xFFFFFFFFL)
-    ssn.message_flow (destination="rdest", unit=1, value=0xFFFFFFFFL)
+    ssn.message_flow (destination="rdest", unit=0, value=0xFFFFFFFF)
+    ssn.message_flow (destination="rdest", unit=1, value=0xFFFFFFFF)
 
   def setBrokerInfo (self, data):
     self.brokerInfo = data
diff --git a/qpid/messaging/constants.py b/qpid/messaging/constants.py
index f230c4d..2c00703 100644
--- a/qpid/messaging/constants.py
+++ b/qpid/messaging/constants.py
@@ -34,7 +34,7 @@ class Constant:
 AMQP_PORT = 5672
 AMQPS_PORT = 5671
 
-UNLIMITED = Constant("UNLIMITED", 0xFFFFFFFFL)
+UNLIMITED = Constant("UNLIMITED", 0xFFFFFFFF)
 
 REJECTED = Constant("REJECTED")
 RELEASED = Constant("RELEASED")
diff --git a/qpid/peer.py b/qpid/peer.py
index 0eee9cc..545d8aa 100644
--- a/qpid/peer.py
+++ b/qpid/peer.py
@@ -534,6 +534,6 @@ class IncomingCompletion:
       #TODO: record and manage the ranges properly
       range = [mark, mark]
       if (self.mark == -1):#hack until wraparound is implemented        
-        self.channel.execution_complete(cumulative_execution_mark=0xFFFFFFFFL, 
ranged_execution_set=range)
+        self.channel.execution_complete(cumulative_execution_mark=0xFFFFFFFF, 
ranged_execution_set=range)
       else:
         self.channel.execution_complete(cumulative_execution_mark=self.mark, 
ranged_execution_set=range)
diff --git a/qpid/session.py b/qpid/session.py
index 95714a1..d04f369 100644
--- a/qpid/session.py
+++ b/qpid/session.py
@@ -275,7 +275,7 @@ class Incoming(Queue):
   def start(self):
     self.session.message_set_flow_mode(self.destination, 
self.session.flow_mode.credit)
     for unit in self.session.credit_unit.VALUES:
-      self.session.message_flow(self.destination, unit, 0xFFFFFFFFL)
+      self.session.message_flow(self.destination, unit, 0xFFFFFFFF)
 
   def stop(self):
     self.session.message_cancel(self.destination)
diff --git a/qpid/testlib.py b/qpid/testlib.py
index 4022a7c..94e0908 100644
--- a/qpid/testlib.py
+++ b/qpid/testlib.py
@@ -136,8 +136,8 @@ class TestBase(unittest.TestCase):
         channel = channel or self.channel
         consumer_tag = keys["destination"]
         channel.message_subscribe(**keys)
-        channel.message_flow(destination=consumer_tag, unit=0, 
value=0xFFFFFFFFL)
-        channel.message_flow(destination=consumer_tag, unit=1, 
value=0xFFFFFFFFL)
+        channel.message_flow(destination=consumer_tag, unit=0, 
value=0xFFFFFFFF)
+        channel.message_flow(destination=consumer_tag, unit=1, 
value=0xFFFFFFFF)
 
     def assertEmpty(self, queue):
         """Assert that the queue is empty"""
@@ -252,5 +252,5 @@ class TestBase010(unittest.TestCase):
         session = session or self.session
         consumer_tag = keys["destination"]
         session.message_subscribe(**keys)
-        session.message_flow(destination=consumer_tag, unit=0, 
value=0xFFFFFFFFL)
-        session.message_flow(destination=consumer_tag, unit=1, 
value=0xFFFFFFFFL)
+        session.message_flow(destination=consumer_tag, unit=0, 
value=0xFFFFFFFF)
+        session.message_flow(destination=consumer_tag, unit=1, 
value=0xFFFFFFFF)
diff --git a/qpid/tests/codec.py b/qpid/tests/codec.py
index 8017f79..8a8236d 100644
--- a/qpid/tests/codec.py
+++ b/qpid/tests/codec.py
@@ -553,7 +553,7 @@ class ResolveTestCase(BaseDataTypes):
     # Test resolving above the max signed 32bit integer value of 2^31 -1
     # As above except use an explicitly cast python long
     def test_resolve_long_above_signed_32bit_max(self):
-        value = 2147483648L #2^31, i.e 1 above the 32bit signed max
+        value = 2147483648  #2^31, i.e 1 above the 32bit signed max
         expected = "signed_long"
         resolved = self.codec.resolve(value.__class__, value)
         self.failUnlessEqual(resolved, expected, "resolve FAILED...expected %s 
got %s" % (expected, resolved))
@@ -561,7 +561,7 @@ class ResolveTestCase(BaseDataTypes):
     # Test resolving an explicitly cast python long of value 1, i.e less than 
the max signed 32bit integer value
     # Should be encoded as a 32bit signed int on the wire
     def test_resolve_long_1(self):
-        value = 1L
+        value = 1
         expected = "signed_int"
         resolved = self.codec.resolve(value.__class__, value)
         self.failUnlessEqual(resolved, expected, "resolve FAILED...expected %s 
got %s" % (expected, resolved))
@@ -585,13 +585,13 @@ class ResolveTestCase(BaseDataTypes):
     # Test resolving a value of 2^63, i.e more than the max a signed 64bit 
integer value can hold.
     # Should throw an exception indicating the value can't be encoded.
     def test_resolve_above_64bit_signed_max(self):
-        value = 9223372036854775808L #2^63
+        value = 9223372036854775808  #2^63
         self.failUnlessRaises(Exception, self.codec.resolve, value.__class__, 
value)
     # -------------------
     # Test resolving a value of -2^63 -1, i.e less than the min a signed 64bit 
integer value can hold.
     # Should throw an exception indicating the value can't be encoded.
     def test_resolve_below_64bit_signed_min(self):
-        value = 9223372036854775808L # -2^63 -1
+        value = 9223372036854775808  # -2^63 -1
         self.failUnlessRaises(Exception, self.codec.resolve, value.__class__, 
value)
     # -------------------
     # Test resolving a float. Should indicate use of double as python uses 
64bit floats
diff --git a/qpid/tests/datatypes.py b/qpid/tests/datatypes.py
index 00e649d..214e580 100644
--- a/qpid/tests/datatypes.py
+++ b/qpid/tests/datatypes.py
@@ -24,16 +24,16 @@ from qpid.ops import DeliveryProperties, 
FragmentProperties, MessageProperties
 class SerialTest(TestCase):
 
   def test(self):
-    for s in (serial(0), serial(0x8FFFFFFFL), serial(0xFFFFFFFFL)):
+    for s in (serial(0), serial(0x8FFFFFFF), serial(0xFFFFFFFF)):
       assert s + 1 > s
       assert s - 1 < s
       assert s < s + 1
       assert s > s - 1
 
-    assert serial(0xFFFFFFFFL) + 1 == serial(0)
+    assert serial(0xFFFFFFFF) + 1 == serial(0)
 
-    assert min(serial(0xFFFFFFFFL), serial(0x0)) == serial(0xFFFFFFFFL)
-    assert max(serial(0xFFFFFFFFL), serial(0x0)) == serial(0x0)
+    assert min(serial(0xFFFFFFFF), serial(0x0)) == serial(0xFFFFFFFF)
+    assert max(serial(0xFFFFFFFF), serial(0x0)) == serial(0x0)
 
   def testIncr(self):
     s = serial(0)
@@ -43,7 +43,7 @@ class SerialTest(TestCase):
   def testIn(self):
     l = [serial(1), serial(2), serial(3), serial(4)]
     assert serial(1) in l
-    assert serial(0xFFFFFFFFL + 2) in l
+    assert serial(0xFFFFFFFF + 2) in l
     assert 4 in l
 
   def testNone(self):
diff --git a/qpid/tests/spec010.py b/qpid/tests/spec010.py
index ac04e1e..9729efe 100644
--- a/qpid/tests/spec010.py
+++ b/qpid/tests/spec010.py
@@ -40,7 +40,7 @@ class SpecTest(TestCase):
     return decoded
 
   def testMessageProperties(self):
-    props = MessageProperties(content_length=3735928559L,
+    props = MessageProperties(content_length=3735928559,
                               reply_to=ReplyTo(exchange="the exchange name",
                                                routing_key="the routing key"))
     dec = self.encdec(props)
diff --git a/qpid_tests/broker_0_10/alternate_exchange.py 
b/qpid_tests/broker_0_10/alternate_exchange.py
index 4d522c8..07ef7ea 100644
--- a/qpid_tests/broker_0_10/alternate_exchange.py
+++ b/qpid_tests/broker_0_10/alternate_exchange.py
@@ -41,16 +41,16 @@ class AlternateExchangeTests(TestBase010):
         session.queue_declare(queue="returns", exclusive=True, 
auto_delete=True)
         session.exchange_bind(queue="returns", exchange="secondary")
         session.message_subscribe(destination="a", queue="returns")
-        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         returned = session.incoming("a")
 
         #declare, bind (to the primary exchange) and consume from a queue for 
'processed' messages
         session.queue_declare(queue="processed", exclusive=True, 
auto_delete=True)
         session.exchange_bind(queue="processed", exchange="primary", 
binding_key="my-key")
         session.message_subscribe(destination="b", queue="processed")
-        session.message_flow(destination="b", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="b", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="b", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="b", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         processed = session.incoming("b")
 
         #publish to the primary exchange
@@ -202,8 +202,8 @@ class AlternateExchangeTests(TestBase010):
         session.queue_declare(queue="deleted", exclusive=True, 
auto_delete=True)
         session.exchange_bind(exchange="dlq", queue="deleted")
         session.message_subscribe(destination="dlq", queue="deleted")
-        session.message_flow(destination="dlq", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="dlq", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="dlq", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="dlq", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         dlq = session.incoming("dlq")
 
         #on a separate session, create an auto-deleted queue using the
@@ -220,7 +220,7 @@ class AlternateExchangeTests(TestBase010):
             session2.message_transfer(message=Message(dp, "Three"))
             session2.message_subscribe(destination="incoming", 
queue="my-queue")
             session2.message_flow(destination="incoming", 
unit=session.credit_unit.message, value=1)
-            session2.message_flow(destination="incoming", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+            session2.message_flow(destination="incoming", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
             self.assertEqual("One", 
session2.incoming("incoming").get(timeout=1).body)
             session2.close()
 
@@ -315,8 +315,8 @@ class AlternateExchangeTests(TestBase010):
 
         #get and reject those messages:
         session.message_subscribe(destination="a", queue="delivery-queue")
-        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         incoming = session.incoming("a")
         for m in ["One", "Two", "Three"]:
             msg = incoming.get(timeout=1)
@@ -339,8 +339,8 @@ class AlternateExchangeTests(TestBase010):
         session.queue_declare(queue="deleted", exclusive=True, 
auto_delete=True)
         session.exchange_bind(exchange="dlq", queue="deleted")
         session.message_subscribe(destination="dlq", queue="deleted")
-        session.message_flow(destination="dlq", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="dlq", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="dlq", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="dlq", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         dlq = session.incoming("dlq")
         return dlq
 
diff --git a/qpid_tests/broker_0_10/broker.py b/qpid_tests/broker_0_10/broker.py
index 81d723e..242b6f1 100644
--- a/qpid_tests/broker_0_10/broker.py
+++ b/qpid_tests/broker_0_10/broker.py
@@ -36,8 +36,8 @@ class BrokerTests(TestBase010):
         # No ack consumer
         ctag = "tag1"
         session.message_subscribe(queue = "myqueue", destination = ctag)
-        session.message_flow(destination=ctag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=ctag, unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination=ctag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=ctag, unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         body = "test no-ack"
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="myqueue"),
 body))
         msg = session.incoming(ctag).get(timeout = 5)
@@ -47,8 +47,8 @@ class BrokerTests(TestBase010):
         session.queue_declare(queue = "otherqueue", exclusive=True, 
auto_delete=True)
         ctag = "tag2"
         session.message_subscribe(queue = "otherqueue", destination = ctag, 
accept_mode = 1)
-        session.message_flow(destination=ctag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=ctag, unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination=ctag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=ctag, unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         body = "test ack"
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="otherqueue"),
 body))
         msg = session.incoming(ctag).get(timeout = 5)
@@ -64,8 +64,8 @@ class BrokerTests(TestBase010):
         session.exchange_bind(queue="test-queue", exchange="amq.fanout")
         consumer_tag = "tag1"
         session.message_subscribe(queue="test-queue", destination=consumer_tag)
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = consumer_tag)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination = consumer_tag)
         queue = session.incoming(consumer_tag)
 
         body = "Immediate Delivery"
@@ -86,8 +86,8 @@ class BrokerTests(TestBase010):
 
         consumer_tag = "tag1"
         session.message_subscribe(queue="test-queue", destination=consumer_tag)
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = consumer_tag)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination = consumer_tag)
         queue = session.incoming(consumer_tag)
         msg = queue.get(timeout=5)
         self.assert_(msg.body == body)
diff --git a/qpid_tests/broker_0_10/dtx.py b/qpid_tests/broker_0_10/dtx.py
index b2cbe8a..4753998 100644
--- a/qpid_tests/broker_0_10/dtx.py
+++ b/qpid_tests/broker_0_10/dtx.py
@@ -574,7 +574,7 @@ class DtxTests(TestBase010):
         session2.dtx_start(xid=tx)
         session2.message_subscribe(queue="dummy", destination="dummy")
         session2.message_flow(destination="dummy", 
unit=session2.credit_unit.message, value=1)
-        session2.message_flow(destination="dummy", 
unit=session2.credit_unit.byte, value=0xFFFFFFFFL)
+        session2.message_flow(destination="dummy", 
unit=session2.credit_unit.byte, value=0xFFFFFFFF)
         msg = session2.incoming("dummy").get(timeout=1)
         session2.message_accept(RangedSet(msg.id))
         session2.message_cancel(destination="dummy")
@@ -751,7 +751,7 @@ class DtxTests(TestBase010):
         #consume from src:
         session.message_subscribe(destination="temp-swap", queue=src)
         session.message_flow(destination="temp-swap", 
unit=session.credit_unit.message, value=1)
-        session.message_flow(destination="temp-swap", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="temp-swap", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         msg = session.incoming("temp-swap").get(timeout=1)
         session.message_cancel(destination="temp-swap")
         session.message_accept(RangedSet(msg.id))
@@ -768,7 +768,7 @@ class DtxTests(TestBase010):
     def assertMessageId(self, expected, queue):
         self.session.message_subscribe(queue=queue, destination="results")
         self.session.message_flow(destination="results", 
unit=self.session.credit_unit.message, value=1)
-        self.session.message_flow(destination="results", 
unit=self.session.credit_unit.byte, value=0xFFFFFFFFL)
+        self.session.message_flow(destination="results", 
unit=self.session.credit_unit.byte, value=0xFFFFFFFF)
         self.assertEqual(expected, 
self.getMessageProperty(self.session.incoming("results").get(timeout=1), 
'correlation_id'))
         self.session.message_cancel(destination="results")
 
diff --git a/qpid_tests/broker_0_10/example.py 
b/qpid_tests/broker_0_10/example.py
index e36907d..83d2081 100644
--- a/qpid_tests/broker_0_10/example.py
+++ b/qpid_tests/broker_0_10/example.py
@@ -69,8 +69,8 @@ class ExampleTest (TestBase010):
         # field that is filled if the reply includes content. In this case the
         # interesting field is the consumer_tag.
         session.message_subscribe(queue="test-queue", 
destination="consumer_tag")
-        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
 
         # We can use the session.incoming(...) method to access the messages
         # delivered for our consumer_tag.
diff --git a/qpid_tests/broker_0_10/exchange.py 
b/qpid_tests/broker_0_10/exchange.py
index 350b96f..e05b9f9 100644
--- a/qpid_tests/broker_0_10/exchange.py
+++ b/qpid_tests/broker_0_10/exchange.py
@@ -112,8 +112,8 @@ class TestHelper(TestBase010):
         else: self.uniqueTag += 1
         consumer_tag = "tag" + str(self.uniqueTag)
         self.session.message_subscribe(queue=queueName, 
destination=consumer_tag)
-        self.session.message_flow(destination=consumer_tag, 
unit=self.session.credit_unit.message, value=0xFFFFFFFFL)
-        self.session.message_flow(destination=consumer_tag, 
unit=self.session.credit_unit.byte, value=0xFFFFFFFFL)
+        self.session.message_flow(destination=consumer_tag, 
unit=self.session.credit_unit.message, value=0xFFFFFFFF)
+        self.session.message_flow(destination=consumer_tag, 
unit=self.session.credit_unit.byte, value=0xFFFFFFFF)
         self.subscriptions.append(consumer_tag)
         return self.session.incoming(consumer_tag)
 
diff --git a/qpid_tests/broker_0_10/management.py 
b/qpid_tests/broker_0_10/management.py
index 534196e..d146ddf 100644
--- a/qpid_tests/broker_0_10/management.py
+++ b/qpid_tests/broker_0_10/management.py
@@ -229,8 +229,8 @@ class ManagementTest (TestBase010):
 
         "Consume the messages of the queue and check they are all there in 
order"
         session.message_subscribe(queue="src-queue", destination="tag")
-        session.message_flow(destination="tag", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="tag", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="tag", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="tag", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         queue = session.incoming("tag")
         for count in twenty:
             consumed_msg = queue.get(timeout=1)
diff --git a/qpid_tests/broker_0_10/message.py 
b/qpid_tests/broker_0_10/message.py
index 42ab071..ef38864 100644
--- a/qpid_tests/broker_0_10/message.py
+++ b/qpid_tests/broker_0_10/message.py
@@ -230,8 +230,8 @@ class MessageTests(TestBase010):
 
         session.message_subscribe(destination="my-consumer", 
queue="test-queue-4")
         myqueue = session.incoming("my-consumer")
-        session.message_flow(destination="my-consumer", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="my-consumer", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="my-consumer", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="my-consumer", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
 
         #should flush here
 
@@ -282,8 +282,8 @@ class MessageTests(TestBase010):
 
         # subscribe with implied acquire, explicit accept:
         session1.message_subscribe(queue = "test-ack-queue", destination = 
"consumer")
-        session1.message_flow(destination="consumer", 
unit=session1.credit_unit.message, value=0xFFFFFFFFL)
-        session1.message_flow(destination="consumer", 
unit=session1.credit_unit.byte, value=0xFFFFFFFFL)
+        session1.message_flow(destination="consumer", 
unit=session1.credit_unit.message, value=0xFFFFFFFF)
+        session1.message_flow(destination="consumer", 
unit=session1.credit_unit.byte, value=0xFFFFFFFF)
         queue = session1.incoming("consumer")
 
         msg1 = queue.get(timeout=1)
@@ -335,8 +335,8 @@ class MessageTests(TestBase010):
         self.assertEquals(queueObj.msgTotalEnqueues, 5)
         self.assertEquals(queueObj.msgTotalDequeues, 3)
 
-        session2.message_flow(destination="checker", 
unit=session2.credit_unit.message, value=0xFFFFFFFFL)
-        session2.message_flow(destination="checker", 
unit=session2.credit_unit.byte, value=0xFFFFFFFFL)
+        session2.message_flow(destination="checker", 
unit=session2.credit_unit.message, value=0xFFFFFFFF)
+        session2.message_flow(destination="checker", 
unit=session2.credit_unit.byte, value=0xFFFFFFFF)
         queue = session2.incoming("checker")
 
         msg3b = queue.get(timeout=1)
@@ -370,8 +370,8 @@ class MessageTests(TestBase010):
         self.assertEquals(queueObj.msgTotalEnqueues, 5)
         self.assertEquals(queueObj.msgTotalDequeues, 5)
 
-        self.session.message_flow(destination="final-checker", 
unit=self.session.credit_unit.message, value=0xFFFFFFFFL)
-        self.session.message_flow(destination="final-checker", 
unit=self.session.credit_unit.byte, value=0xFFFFFFFFL)
+        self.session.message_flow(destination="final-checker", 
unit=self.session.credit_unit.message, value=0xFFFFFFFF)
+        self.session.message_flow(destination="final-checker", 
unit=self.session.credit_unit.byte, value=0xFFFFFFFF)
         try:
             extra = self.session.incoming("final-checker").get(timeout=1)
             self.fail("Got unexpected message: " + extra.body)
@@ -384,16 +384,16 @@ class MessageTests(TestBase010):
         session.exchange_bind(queue = "r", exchange = "amq.fanout")
 
         session.message_subscribe(queue = "q", destination = "consumer")
-        session.message_flow(destination="consumer", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="consumer", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="consumer", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="consumer", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"),
 "blah, blah"))
         msg = session.incoming("consumer").get(timeout = 1)
         self.assertEquals(msg.body, "blah, blah")
         session.message_reject(RangedSet(msg.id))
 
         session.message_subscribe(queue = "r", destination = "checker")
-        session.message_flow(destination="checker", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="checker", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="checker", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="checker", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         msg = session.incoming("checker").get(timeout = 1)
         self.assertEquals(msg.body, "blah, blah")
 
@@ -414,7 +414,7 @@ class MessageTests(TestBase010):
         #set message credit to finite amount (less than enough for all 
messages)
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "c")
         #set infinite byte credit
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="c")
         #check that expected number were received
         q = session.incoming("c")
         for i in range(1, 6):
@@ -447,7 +447,7 @@ class MessageTests(TestBase010):
         #set byte credit to finite amount (less than enough for all messages)
         session.message_flow(unit = session.credit_unit.byte, value = 
msg_size*5, destination = "c")
         #set infinite message credit
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination ="c")
         #check that expected number were received
         q = session.incoming("c")
         for i in range(5):
@@ -478,7 +478,7 @@ class MessageTests(TestBase010):
         #set message credit to finite amount (less than enough for all 
messages)
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "c")
         #set infinite byte credit
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="c")
         #check that expected number were received
         q = session.incoming("c")
         ids = []
@@ -519,7 +519,7 @@ class MessageTests(TestBase010):
         #set byte credit to finite amount (less than enough for all messages)
         session.message_flow(unit = session.credit_unit.byte, value = 
msg_size*5, destination = "c")
         #set infinite message credit
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination ="c")
         #check that expected number were received
         q = session.incoming("c")
         msgs = []
@@ -554,7 +554,7 @@ class MessageTests(TestBase010):
         
ssn.message_transfer(message=Message(ssn.delivery_properties(routing_key="q"), 
"A"))
 
         for unit in ssn.credit_unit.VALUES:
-            ssn.message_flow("c", unit, 0xFFFFFFFFL)
+            ssn.message_flow("c", unit, 0xFFFFFFFF)
 
         q = ssn.incoming("c")
         msgA = q.get(timeout=10)
@@ -567,7 +567,7 @@ class MessageTests(TestBase010):
         ssn.message_accept(RangedSet(msgA.id))
 
         for unit in ssn.credit_unit.VALUES:
-            ssn.message_flow("c", unit, 0xFFFFFFFFL)
+            ssn.message_flow("c", unit, 0xFFFFFFFF)
 
         #send message B
         
ssn.message_transfer(message=Message(ssn.delivery_properties(routing_key="q"), 
"B"))
@@ -584,7 +584,7 @@ class MessageTests(TestBase010):
         session.message_subscribe(queue = "q", destination = "c")
         session.message_set_flow_mode(flow_mode = 1, destination = "c")
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "c")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="c")
 
 
         #send batch of messages to queue
@@ -609,7 +609,7 @@ class MessageTests(TestBase010):
 
         #re-establish window and check remaining messages
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "c")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="c")
         for i in range(0, 5):
             msg = q.get(timeout = 1)
             self.assertDataEquals(session, msg, "Message %d" % (i+6))
@@ -634,7 +634,7 @@ class MessageTests(TestBase010):
         session.message_subscribe(queue=self.test_queue_name, destination="a")
         a = session.incoming("a")
         session.message_set_flow_mode(flow_mode = 1, destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         # issue 5 message credits
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "a")
 
@@ -653,7 +653,7 @@ class MessageTests(TestBase010):
 
         session.message_stop(destination = "a")
 
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "a")
 
         # complete earlier messages after setting the window to 5 message 
credits
@@ -681,8 +681,8 @@ class MessageTests(TestBase010):
         session.message_subscribe(queue=self.test_queue_name, destination="a")
         a = session.incoming("a")
         session.message_set_flow_mode(flow_mode = session.flow_mode.credit, 
destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFAL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFA, destination ="a")
         #test wraparound of credit balance does not occur
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
         for i in range(1, 50):
@@ -703,11 +703,11 @@ class MessageTests(TestBase010):
             
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"),
 "Message %s" % i))
 
         session.message_subscribe(queue = "q", destination = "a", acquire_mode 
= 1)
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination ="a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_subscribe(queue = "q", destination = "b", acquire_mode 
= 1)
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = "b")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "b")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination ="b")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="b")
 
         for i in range(6, 11):
             
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"),
 "Message %s" % i))
@@ -739,8 +739,8 @@ class MessageTests(TestBase010):
 
         session.message_subscribe(queue = "q", destination = "a", acquire_mode 
= 1, accept_mode = 1)
         session.message_set_flow_mode(flow_mode = session.flow_mode.credit, 
destination = "a")
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination ="a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         msg = session.incoming("a").get(timeout = 1)
         self.assertEquals("acquire me", msg.body)
         #message should still be on the queue:
@@ -763,8 +763,8 @@ class MessageTests(TestBase010):
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"),
 "acquire me"))
 
         session.message_subscribe(queue = "q", destination = "a", acquire_mode 
= 1)
-        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         msg = session.incoming("a").get(timeout = 1)
         self.assertEquals("acquire me", msg.body)
         #message should still be on the queue:
@@ -789,8 +789,8 @@ class MessageTests(TestBase010):
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="q"),
 "release me"))
 
         session.message_subscribe(queue = "q", destination = "a")
-        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="a", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="a", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         msg = session.incoming("a").get(timeout = 1)
         self.assertEquals("release me", msg.body)
         session.message_cancel(destination = "a")
@@ -810,7 +810,7 @@ class MessageTests(TestBase010):
 
         session.message_subscribe(queue = "q", destination = "a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         queue = session.incoming("a")
         first = queue.get(timeout = 1)
         for i in range(2, 10):
@@ -843,7 +843,7 @@ class MessageTests(TestBase010):
 
         session.message_subscribe(queue = "q", destination = "a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         queue = session.incoming("a")
         ids = []
         for i in range (1, 11):
@@ -868,8 +868,8 @@ class MessageTests(TestBase010):
         session.close(timeout=10)
 
         session = self.session
-        session.message_flow(destination="checker", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="checker", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="checker", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="checker", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         queue = session.incoming("checker")
 
         self.assertEquals("message 4", queue.get(timeout = 1).body)
@@ -887,7 +887,7 @@ class MessageTests(TestBase010):
         session.message_subscribe(queue = "q", destination = "a")
         session.message_set_flow_mode(flow_mode = 0, destination = "a")
         session.message_flow(unit = session.credit_unit.message, value = 5, 
destination = "a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
 
         queue = session.incoming("a")
         for i in range(1, 6):
@@ -902,7 +902,7 @@ class MessageTests(TestBase010):
 
         #now create a not-acquired subscriber
         session.message_subscribe(queue = "q", destination = "b", 
acquire_mode=1)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "b")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="b")
 
         #check it gets those not consumed
         queue = session.incoming("b")
@@ -930,7 +930,7 @@ class MessageTests(TestBase010):
 
         #create a not-acquired subscriber
         session.message_subscribe(queue = "q", destination = "a", 
acquire_mode=1)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
 
         #browse through messages
@@ -952,7 +952,7 @@ class MessageTests(TestBase010):
 
         #create a second not-acquired subscriber
         session.message_subscribe(queue = "q", destination = "b", 
acquire_mode=1)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "b")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="b")
         session.message_flow(unit = session.credit_unit.message, value = 1, 
destination = "b")
         #check it gets those not consumed
         queue = session.incoming("b")
@@ -979,12 +979,12 @@ class MessageTests(TestBase010):
 
         #create two 'browsers'
         session.message_subscribe(queue = "q", destination = "a", 
acquire_mode=1)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
         queueA = session.incoming("a")
 
         session.message_subscribe(queue = "q", destination = "b", 
acquire_mode=1)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "b")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="b")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "b")
         queueB = session.incoming("b")
         
@@ -1001,7 +1001,7 @@ class MessageTests(TestBase010):
         
         #create consumer
         session.message_subscribe(queue = "q", destination = "c")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "c")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="c")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "c")
         queueC = session.incoming("c")
         #consume the message then ack it
@@ -1023,7 +1023,7 @@ class MessageTests(TestBase010):
         #subscribe:
         session.message_subscribe(queue="q", destination="a")
         a = session.incoming("a")
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
 
         # receive all messages into list
@@ -1058,8 +1058,8 @@ class MessageTests(TestBase010):
 
         consumer_tag = "tag1"
         session.message_subscribe(queue="xyz", destination=consumer_tag)
-        session.message_flow(unit = session.credit_unit.message, value = 
0xFFFFFFFFL, destination = consumer_tag)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.message, value 
=0xFFFFFFFF, destination = consumer_tag)
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination = consumer_tag)
         queue = session.incoming(consumer_tag)
         msg = queue.get(timeout=1)
         self.assertEquals("", msg.body)
@@ -1098,7 +1098,7 @@ class MessageTests(TestBase010):
         messages = session.incoming(d)
         sleep(1)
         session.message_flow(unit = session.credit_unit.message, value=2, 
destination=d)
-        session.message_flow(unit = session.credit_unit.byte, 
value=0xFFFFFFFFL, destination=d)
+        session.message_flow(unit = session.credit_unit.byte, 
value=0xFFFFFFFF, destination=d)
         assert messages.get(timeout=1).body == "second"
         self.assertEmpty(messages)
 
diff --git a/qpid_tests/broker_0_10/persistence.py 
b/qpid_tests/broker_0_10/persistence.py
index e9cf9b7..42698ae 100644
--- a/qpid_tests/broker_0_10/persistence.py
+++ b/qpid_tests/broker_0_10/persistence.py
@@ -50,7 +50,7 @@ class PersistenceTests(TestBase010):
 
         #create consumer
         session.message_subscribe(queue = "q", destination = "a", accept_mode 
= 1, acquire_mode=0)
-        session.message_flow(unit = session.credit_unit.byte, value = 
0xFFFFFFFFL, destination = "a")
+        session.message_flow(unit = session.credit_unit.byte, value 
=0xFFFFFFFF, destination ="a")
         session.message_flow(unit = session.credit_unit.message, value = 10, 
destination = "a")
         queue = session.incoming("a")
 
diff --git a/qpid_tests/broker_0_10/queue.py b/qpid_tests/broker_0_10/queue.py
index 68fe854..6dbc842 100644
--- a/qpid_tests/broker_0_10/queue.py
+++ b/qpid_tests/broker_0_10/queue.py
@@ -49,8 +49,8 @@ class QueueTests(TestBase010):
         #send a further message and consume it, ensuring that the other 
messages are really gone
         
session.message_transfer(message=Message(session.delivery_properties(routing_key="test-queue"),
 "four"))
         session.message_subscribe(queue="test-queue", destination="tag")
-        session.message_flow(destination="tag", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="tag", unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination="tag", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="tag", unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
         queue = session.incoming("tag")
         msg = queue.get(timeout=1)
         self.assertEqual("four", msg.body)
@@ -251,11 +251,11 @@ class QueueTests(TestBase010):
         session.queue_declare(queue="queue-2", exclusive=True, 
auto_delete=True)
 
         session.message_subscribe(queue="queue-1", destination="queue-1")
-        session.message_flow(destination="queue-1", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="queue-1", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="queue-1", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="queue-1", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         session.message_subscribe(queue="queue-2", destination="queue-2")
-        session.message_flow(destination="queue-2", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="queue-2", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="queue-2", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="queue-2", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
 
         queue1 = session.incoming("queue-1")
         queue2 = session.incoming("queue-2")
@@ -352,8 +352,8 @@ class QueueTests(TestBase010):
 
         #empty queue:
         session.message_subscribe(destination="consumer_tag", 
queue="delete-me-2")
-        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination="consumer_tag", 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
         queue = session.incoming("consumer_tag")
         msg = queue.get(timeout=1)
         self.assertEqual("message", msg.body)
diff --git a/qpid_tests/broker_0_10/tx.py b/qpid_tests/broker_0_10/tx.py
index 8cdc539..956e25b 100644
--- a/qpid_tests/broker_0_10/tx.py
+++ b/qpid_tests/broker_0_10/tx.py
@@ -251,13 +251,13 @@ class TxTests(TestBase010):
         session = session or self.session
         consumer_tag = keys["destination"]
         session.message_subscribe(**keys)
-        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
 
     def enable_flow(self, tag, session=None):
         session = session or self.session
-        session.message_flow(destination=tag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=tag, unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination=tag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=tag, unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
 
     def complete(self, session, msg):
         session.receiver._completed.add(msg.id)#TODO: this may be done 
automatically
diff --git a/qpid_tests/broker_1_0/tx.py b/qpid_tests/broker_1_0/tx.py
index 45817fc..eb84f4c 100644
--- a/qpid_tests/broker_1_0/tx.py
+++ b/qpid_tests/broker_1_0/tx.py
@@ -251,13 +251,13 @@ class TxTests(TestBase010):
         session = session or self.session
         consumer_tag = keys["destination"]
         session.message_subscribe(**keys)
-        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.byte, value=0xFFFFFFFFL)
+        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=consumer_tag, 
unit=session.credit_unit.byte, value=0xFFFFFFFF)
 
     def enable_flow(self, tag, session=None):
         session = session or self.session
-        session.message_flow(destination=tag, 
unit=session.credit_unit.message, value=0xFFFFFFFFL)
-        session.message_flow(destination=tag, unit=session.credit_unit.byte, 
value=0xFFFFFFFFL)
+        session.message_flow(destination=tag, 
unit=session.credit_unit.message, value=0xFFFFFFFF)
+        session.message_flow(destination=tag, unit=session.credit_unit.byte, 
value=0xFFFFFFFF)
 
     def complete(self, session, msg):
         session.receiver._completed.add(msg.id)#TODO: this may be done 
automatically


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

Reply via email to