[python-qpid] Fixes for bz632349 and bz632395.
Rafael Schloming
rhs at fedoraproject.org
Mon Sep 13 14:29:34 UTC 2010
commit 86076b0f6ad47493fdef16c62dff6e738863215d
Author: Rafael H. Schloming <rafaels at redhat.com>
Date: Mon Sep 13 10:29:08 2010 -0400
Fixes for bz632349 and bz632395.
0001-BZ-597066.patch | 4 +-
...Fixed-connection.start-hangs-if-connectio.patch | 4 +-
...Fixed-qpid-python-high-level-API-clients-.patch | 4 +-
...dded-back-values-method-for-backwards-com.patch | 4 +-
0005-BZ-567249-fix-for-python-2.3.patch | 4 +-
...erformance-tweaks-for-receive-added-confi.patch | 4 +-
...817-don-t-always-set-the-sync-bit-on-send.patch | 4 +-
...eset-reconnect-delay-after-successful-con.patch | 4 +-
...dded-full-support-for-unreliable-at-least.patch | 4 +-
...dded-optional-timeouts-to-connection-sess.patch | 4 +-
...dded-support-for-x-amqp-0-10.-app-id-cont.patch | 4 +-
...ake-sure-we-initialize-properties-even-if.patch | 4 +-
...ix-timeout-tests-to-not-leave-queues-lyin.patch | 4 +-
...dd-uuid-prefix-to-addresses-beginning-wit.patch | 4 +-
...-fix-mangling-for-addresses-that-are-None.patch | 4 +-
0016-BZ-608807-fixed-concurrent-close.patch | 4 +-
...Z-609258-added-accessor-for-auth_username.patch | 4 +-
0018-BZ-609258-fixed-auth-username-for-sasl.patch | 4 +-
...Assertion-when-raising-a-link-established.patch | 4 +-
...-convert-ttl-from-seconds-to-milliseconds.patch | 4 +-
...ixed-payload-of-None-for-text-plain-messa.patch | 4 +-
0022-removed-old-python-examples.patch | 4 +-
...ixed-missign-import-and-added-test-case-f.patch | 4 +-
...liminate-spurious-error-logging-and-recon.patch | 4 +-
...ixed-parsing-of-failover-URLs-fixed-drive.patch | 4 +-
...Z-614344-default-ports-for-reconnect_urls.patch | 4 +-
...ixed-bug-in-flow-control-logic-added-test.patch | 4 +-
0028-BZ-621998-fixed-heartbeating.patch | 4 +-
...ditional-assignment-to-vanilla-if-then-el.patch | 4 +-
...ally-Python-before-2.5-did-not-allow-fina.patch | 4 +-
...ManagementTest.test_broker_connectivity_o.patch | 4 +-
0032-BZ-621527-default-sasl-service-to-qpidd.patch | 4 +-
...ix-error-reporting-for-negotiation-failur.patch | 4 +-
0034-BZ-624714-fixed-reply-to-conversion.patch | 4 +-
...Python-Qpid-does-not-properly-encode-bool.patch | 56 ++++++++++
...ade-qpid.datatypes-module-use-builtin-UUI.patch | 106 ++++++++++++++++++++
...-assertion-to-check-that-deletion-of-defa.patch | 25 +++++
0038-handle-request-timeout.patch | 28 +++++
...h-to-not-hang-on-session-error-fixed-the-.patch | 63 ++++++++++++
python-qpid.spec | 17 +++-
40 files changed, 361 insertions(+), 70 deletions(-)
---
diff --git a/0001-BZ-597066.patch b/0001-BZ-597066.patch
index 960457b..7d54f88 100644
--- a/0001-BZ-597066.patch
+++ b/0001-BZ-597066.patch
@@ -1,7 +1,7 @@
From 7f006841387b54cb0165cfa6d1423cd3fae06ce2 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Tue, 1 Jun 2010 09:25:23 +0000
-Subject: [PATCH 01/34] BZ-597066
+Subject: [PATCH 01/39] BZ-597066
Don't use guest/guest default username/password, use None instead (this allows sasl implementation to infer the correct choice while retaining the ability to override it should that be desired)
@@ -27,5 +27,5 @@ index 3016543..f5f957c 100644
self.sasl_mechanisms = options.get("sasl_mechanisms")
self.sasl_service = options.get("sasl_service", "qpidd")
--
-1.7.2
+1.7.2.2
diff --git a/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch b/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
index 1846995..61d7623 100644
--- a/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
+++ b/0002-Bug-538188-Fixed-connection.start-hangs-if-connectio.patch
@@ -1,7 +1,7 @@
From 9e7d9497b8665b51075ddcfd1d01d805f009f78b Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Wed, 2 Jun 2010 10:24:10 +0000
-Subject: [PATCH 02/34] Bug 538188 - Fixed connection.start() hangs if connection is not accepted
+Subject: [PATCH 02/39] Bug 538188 - Fixed connection.start() hangs if connection is not accepted
QPID-2637: Mark connection as failed if read from socket fails
@@ -24,5 +24,5 @@ index 2c61e5a..7dbefb8 100644
for ssn in self.attached.values():
if self.close_code[0] != 200:
--
-1.7.2
+1.7.2.2
diff --git a/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch b/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
index 24e9f29..db6576a 100644
--- a/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
+++ b/0003-Bug-597149-Fixed-qpid-python-high-level-API-clients-.patch
@@ -1,7 +1,7 @@
From 4ee966781844a3757eaa44ebf4690105c2f18850 Mon Sep 17 00:00:00 2001
From: Gordon Sim <gsim at apache.org>
Date: Wed, 9 Jun 2010 15:37:02 +0000
-Subject: [PATCH 03/34] Bug 597149 - Fixed - qpid python high level API clients not runnable on RHEL4 incompatible with python 2.3.4 OptionParser
+Subject: [PATCH 03/39] Bug 597149 - Fixed - qpid python high level API clients not runnable on RHEL4 incompatible with python 2.3.4 OptionParser
Minor adjustment to option definitions for Python 2.3
@@ -78,5 +78,5 @@ index dacebb5..c2dc4db 100755
parser.add_option("-I", "--id", help="use the supplied id instead of generating one")
parser.add_option("-S", "--subject", help="specify a subject")
--
-1.7.2
+1.7.2.2
diff --git a/0004-BZ-567249-added-back-values-method-for-backwards-com.patch b/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
index 9aa5c9d..4e1d2fe 100644
--- a/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
+++ b/0004-BZ-567249-added-back-values-method-for-backwards-com.patch
@@ -1,7 +1,7 @@
From 38ce79eee4d48e2be75c6d74ded2c383fba5810c Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 15 Jun 2010 10:11:39 +0000
-Subject: [PATCH 04/34] BZ-567249 added back values method for backwards compatibility
+Subject: [PATCH 04/39] BZ-567249 added back values method for backwards compatibility
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@954787 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -35,5 +35,5 @@ index acb54ae..8c9f8a0 100644
class Field:
--
-1.7.2
+1.7.2.2
diff --git a/0005-BZ-567249-fix-for-python-2.3.patch b/0005-BZ-567249-fix-for-python-2.3.patch
index bea00af..740747b 100644
--- a/0005-BZ-567249-fix-for-python-2.3.patch
+++ b/0005-BZ-567249-fix-for-python-2.3.patch
@@ -1,7 +1,7 @@
From 4e05457ddfe178ac4cfa55bb1dcd6986c272e500 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 15 Jun 2010 14:13:15 +0000
-Subject: [PATCH 05/34] BZ-567249 fix for python 2.3
+Subject: [PATCH 05/39] BZ-567249 fix for python 2.3
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@954901 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -27,5 +27,5 @@ index 8c9f8a0..390552b 100644
class Field:
--
-1.7.2
+1.7.2.2
diff --git a/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch b/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
index 28b95d3..f49ed44 100644
--- a/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
+++ b/0006-BZ-596677-performance-tweaks-for-receive-added-confi.patch
@@ -1,7 +1,7 @@
From b0ae853c18fad859d5e7daabcb0598ab2d197ea6 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 16 Jun 2010 16:47:18 +0000
-Subject: [PATCH 06/34] BZ-596677 performance tweaks for receive: added configurable threshold for issuing credit; don't disable byte credit more than necessary; avoided n-squared loop for generating acks
+Subject: [PATCH 06/39] BZ-596677 performance tweaks for receive: added configurable threshold for issuing credit; don't disable byte credit more than necessary; avoided n-squared loop for generating acks
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955296 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -132,5 +132,5 @@ index f5f957c..707aee3 100644
def _grant(self):
--
-1.7.2
+1.7.2.2
diff --git a/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch b/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
index 4ffbbd8..40fa6aa 100644
--- a/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
+++ b/0007-BZ-574817-don-t-always-set-the-sync-bit-on-send.patch
@@ -1,7 +1,7 @@
From e1c3a645453c2796b67625a1e00341894777f223 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 16 Jun 2010 22:15:14 +0000
-Subject: [PATCH 07/34] BZ-574817 don't always set the sync bit on send
+Subject: [PATCH 07/39] BZ-574817 don't always set the sync bit on send
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955414 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -132,5 +132,5 @@ index 707aee3..58a654e 100644
@synchronized
--
-1.7.2
+1.7.2.2
diff --git a/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch b/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
index e8711dd..afe84a6 100644
--- a/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
+++ b/0008-BZ-604836-reset-reconnect-delay-after-successful-con.patch
@@ -1,7 +1,7 @@
From df73fc4c6a53f8b266fb88af60ea68df03057668 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 17 Jun 2010 02:18:24 +0000
-Subject: [PATCH 08/34] BZ-604836 reset reconnect delay after successful connect
+Subject: [PATCH 08/39] BZ-604836 reset reconnect delay after successful connect
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@955462 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -21,5 +21,5 @@ index a6170c0..7f04903 100644
except socket.error, e:
self._host = (self._host + 1) % len(self._hosts)
--
-1.7.2
+1.7.2.2
diff --git a/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch b/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
index f2307ce..bdc3091 100644
--- a/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
+++ b/0009-BZ-560707-added-full-support-for-unreliable-at-least.patch
@@ -1,7 +1,7 @@
From 3f3e6086766770c3d7e1a7cf9afdfaedce82dd18 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 24 Jun 2010 17:34:34 +0000
-Subject: [PATCH 09/34] BZ-560707 added full support for unreliable, at-least-once, and at-most-once reliability options
+Subject: [PATCH 09/39] BZ-560707 added full support for unreliable, at-least-once, and at-most-once reliability options
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@957644 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -201,5 +201,5 @@ index 3133fe7..dce8d9b 100644
def setup_connection(self):
--
-1.7.2
+1.7.2.2
diff --git a/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch b/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
index fcf8600..18eb5fe 100644
--- a/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
+++ b/0010-BZ-569515-added-optional-timeouts-to-connection-sess.patch
@@ -1,7 +1,7 @@
From 495213b8cc66dc00c15662c559a48dcf04516fd7 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 17:09:05 +0000
-Subject: [PATCH 10/34] BZ-569515 added optional timeouts to {connection,session,sender,receiver}.close() as well as connection.detach() and {session,sender}.sync()
+Subject: [PATCH 10/39] BZ-569515 added optional timeouts to {connection,session,sender,receiver}.close() as well as connection.detach() and {session,sender}.sync()
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958037 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -329,5 +329,5 @@ index dce8d9b..b064d62 100644
ACK_QD = 'test-ack-queue; {delete: always}'
--
-1.7.2
+1.7.2.2
diff --git a/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch b/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
index 1377ac6..ea7c5ba 100644
--- a/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
+++ b/0011-BZ-608118-added-support-for-x-amqp-0-10.-app-id-cont.patch
@@ -1,7 +1,7 @@
From 9201b99100d8d47b3ed92573eea0e71969996418 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:12:28 +0000
-Subject: [PATCH 11/34] BZ-608118 added support for x-amqp-0-10.{app-id,content-encoding,routing-key}
+Subject: [PATCH 11/39] BZ-608118 added support for x-amqp-0-10.{app-id,content-encoding,routing-key}
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958055 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -98,5 +98,5 @@ index 2ca1fbf..91aab5f 100644
def testMapContent(self):
self.check(Message(MessageEchoTests.TEST_MAP))
--
-1.7.2
+1.7.2.2
diff --git a/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch b/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
index 9593052..0f6724f 100644
--- a/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
+++ b/0012-BZ-608118-make-sure-we-initialize-properties-even-if.patch
@@ -1,7 +1,7 @@
From d5086ed9cd510ce9f1dc80da90315518d5c3ebd2 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:26:14 +0000
-Subject: [PATCH 12/34] BZ-608118 make sure we initialize properties even if application_headers is None
+Subject: [PATCH 12/39] BZ-608118 make sure we initialize properties even if application_headers is None
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958060 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -22,5 +22,5 @@ index ed6b602..a732a60 100644
msg.properties["x-amqp-0-10.app-id"] = mp.app_id
if mp.content_encoding is not None:
--
-1.7.2
+1.7.2.2
diff --git a/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch b/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
index 58743f0..d861aeb 100644
--- a/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
+++ b/0013-BZ-569515-fix-timeout-tests-to-not-leave-queues-lyin.patch
@@ -1,7 +1,7 @@
From ee19a4688911a9fc55dea5f3176e99d6b77acafe Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 18:57:59 +0000
-Subject: [PATCH 13/34] BZ-569515 fix timeout tests to not leave queues lying around
+Subject: [PATCH 13/39] BZ-569515 fix timeout tests to not leave queues lying around
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958077 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -22,5 +22,5 @@ index b064d62..c01f16e 100644
def teardown_connection(self, conn):
try:
--
-1.7.2
+1.7.2.2
diff --git a/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch b/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
index e5ec171..65ca3db 100644
--- a/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
+++ b/0014-BZ-607798-add-uuid-prefix-to-addresses-beginning-wit.patch
@@ -1,7 +1,7 @@
From 1834e02e7dd0abd92d4bee09818f86f4fb6af89b Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Fri, 25 Jun 2010 19:06:05 +0000
-Subject: [PATCH 14/34] BZ-607798 add uuid prefix to addresses beginning with hash(#)
+Subject: [PATCH 14/39] BZ-607798 add uuid prefix to addresses beginning with hash(#)
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958083 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -42,5 +42,5 @@ index 30f51fe..8bddc96 100644
"""
--
-1.7.2
+1.7.2.2
diff --git a/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch b/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
index 3726713..77a72d4 100644
--- a/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
+++ b/0015-BZ-607798-fix-mangling-for-addresses-that-are-None.patch
@@ -1,7 +1,7 @@
From dcc6c20a11f1dffac6708a128517757e7b1e0324 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 28 Jun 2010 11:35:59 +0000
-Subject: [PATCH 15/34] BZ-607798 fix mangling for addresses that are None
+Subject: [PATCH 15/39] BZ-607798 fix mangling for addresses that are None
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@958547 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -22,5 +22,5 @@ index 8bddc96..62423ca 100644
else:
return addr
--
-1.7.2
+1.7.2.2
diff --git a/0016-BZ-608807-fixed-concurrent-close.patch b/0016-BZ-608807-fixed-concurrent-close.patch
index d37bb91..db5cb8e 100644
--- a/0016-BZ-608807-fixed-concurrent-close.patch
+++ b/0016-BZ-608807-fixed-concurrent-close.patch
@@ -1,7 +1,7 @@
From 62d79016f13c729abccba7a84d1dbb33ec94d9d5 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 12:44:58 +0000
-Subject: [PATCH 16/34] BZ-608807 fixed concurrent close
+Subject: [PATCH 16/39] BZ-608807 fixed concurrent close
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959289 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -468,5 +468,5 @@ index c01f16e..52ca9f3 100644
content = self.send("testCapacityIncrease")
self.sleep()
--
-1.7.2
+1.7.2.2
diff --git a/0017-BZ-609258-added-accessor-for-auth_username.patch b/0017-BZ-609258-added-accessor-for-auth_username.patch
index 1388ae5..43c45e3 100644
--- a/0017-BZ-609258-added-accessor-for-auth_username.patch
+++ b/0017-BZ-609258-added-accessor-for-auth_username.patch
@@ -1,7 +1,7 @@
From d31918432748c8e6f3596548796fb45bf778b20e Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 14:25:03 +0000
-Subject: [PATCH 17/34] BZ-609258 added accessor for auth_username
+Subject: [PATCH 17/39] BZ-609258 added accessor for auth_username
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959326 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -59,5 +59,5 @@ index 6b00dda..6645903 100644
from saslwrapper import Client as _Client
Client = WrapperClient
--
-1.7.2
+1.7.2.2
diff --git a/0018-BZ-609258-fixed-auth-username-for-sasl.patch b/0018-BZ-609258-fixed-auth-username-for-sasl.patch
index 1641493..26fb9b0 100644
--- a/0018-BZ-609258-fixed-auth-username-for-sasl.patch
+++ b/0018-BZ-609258-fixed-auth-username-for-sasl.patch
@@ -1,7 +1,7 @@
From 5c3a50f97f327161fd5bd991c8ef4a8b6aece62a Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 30 Jun 2010 14:36:43 +0000
-Subject: [PATCH 18/34] BZ-609258 fixed auth username for sasl
+Subject: [PATCH 18/39] BZ-609258 fixed auth username for sasl
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@959333 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -26,5 +26,5 @@ index 6645903..d4c15bd 100644
class PlainClient:
--
-1.7.2
+1.7.2.2
diff --git a/0019-Bug-611543-Assertion-when-raising-a-link-established.patch b/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
index b4ac2e5..2fd73b5 100644
--- a/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
+++ b/0019-Bug-611543-Assertion-when-raising-a-link-established.patch
@@ -1,7 +1,7 @@
From ba83c5fd4c4cccae42240c70473d8d37fd8d3fcb Mon Sep 17 00:00:00 2001
From: Alan Conway <aconway at apache.org>
Date: Mon, 5 Jul 2010 20:12:08 +0000
-Subject: [PATCH 19/34] Bug 611543 - Assertion when raising a link established event on clustered broker
+Subject: [PATCH 19/39] Bug 611543 - Assertion when raising a link established event on clustered broker
Defer delivery of messages in cluster-unsafe context.
@@ -55,5 +55,5 @@ index 2242dcb..fddeefa 100644
def ready(self):
"""Wait till broker is ready to serve clients"""
--
-1.7.2
+1.7.2.2
diff --git a/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch b/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
index 4fb485d..d1fb680 100644
--- a/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
+++ b/0020-BZ-612615-convert-ttl-from-seconds-to-milliseconds.patch
@@ -1,7 +1,7 @@
From a0e4c21893973aea53b773381ee6ca2c7e6dbcb2 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 8 Jul 2010 15:53:49 +0000
-Subject: [PATCH 20/34] BZ-612615 convert ttl from seconds to milliseconds
+Subject: [PATCH 20/39] BZ-612615 convert ttl from seconds to milliseconds
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@961824 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -70,5 +70,5 @@ index a96a6da..e2406f1 100644
@ivar properties: application specific message properties
@type content_type: str
--
-1.7.2
+1.7.2.2
diff --git a/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch b/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
index c003b09..3d165ad 100644
--- a/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
+++ b/0021-BZ-613216-fixed-payload-of-None-for-text-plain-messa.patch
@@ -1,7 +1,7 @@
From ee2dcac6734efed72b2379cf22437799e8f39efc Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 12 Jul 2010 13:43:27 +0000
-Subject: [PATCH 21/34] BZ-613216 fixed payload of None for text/plain messages
+Subject: [PATCH 21/39] BZ-613216 fixed payload of None for text/plain messages
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963280 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -54,5 +54,5 @@ index 91aab5f..526a5cf 100644
+ def testTextPlainEmpty(self):
+ self.check(Message(content_type="text/plain"))
--
-1.7.2
+1.7.2.2
diff --git a/0022-removed-old-python-examples.patch b/0022-removed-old-python-examples.patch
index e074058..8b1b497 100644
--- a/0022-removed-old-python-examples.patch
+++ b/0022-removed-old-python-examples.patch
@@ -1,7 +1,7 @@
From 3d0eebd14b24321d5c91662c873c1b689c360150 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 16:33:24 +0000
-Subject: [PATCH 22/34] removed old python examples
+Subject: [PATCH 22/39] removed old python examples
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963786 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -3133,5 +3133,5 @@ index fa97cab..0000000
-
-session.close()
--
-1.7.2
+1.7.2.2
diff --git a/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch b/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
index 84d1455..24cd87e 100644
--- a/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
+++ b/0023-BZ-613912-fixed-missign-import-and-added-test-case-f.patch
@@ -1,7 +1,7 @@
From dee1c0cebff68b694ed6e80be79b8943ebb40574 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 17:58:44 +0000
-Subject: [PATCH 23/34] BZ-613912 fixed missign import and added test case for reconnect_urls
+Subject: [PATCH 23/39] BZ-613912 fixed missign import and added test case for reconnect_urls
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963803 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -74,5 +74,5 @@ index 3409d77..e62bebd 100644
def __repr__(self):
return "URL(%r)" % str(self)
--
-1.7.2
+1.7.2.2
diff --git a/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch b/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
index 9872d7c..2996c7a 100644
--- a/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
+++ b/0024-BZ-614054-eliminate-spurious-error-logging-and-recon.patch
@@ -1,7 +1,7 @@
From 69472698c9455b198d70e7b61ae2f1f06a8ff783 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Tue, 13 Jul 2010 19:07:22 +0000
-Subject: [PATCH 24/34] BZ-614054 eliminate spurious error logging and reconnect attempts
+Subject: [PATCH 24/39] BZ-614054 eliminate spurious error logging and reconnect attempts
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@963825 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -47,5 +47,5 @@ index 42bc280..44833f7 100644
ssn.acknowledge(msg, sync=False)
--
-1.7.2
+1.7.2.2
diff --git a/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch b/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
index 42e2ea9..9c0aaea 100644
--- a/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
+++ b/0025-BZ-614054-fixed-parsing-of-failover-URLs-fixed-drive.patch
@@ -1,7 +1,7 @@
From 5387d39d66787509b3d687be7247dcf8a2d4b207 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 14 Jul 2010 13:36:03 +0000
-Subject: [PATCH 25/34] BZ-614054 fixed parsing of failover URLs; fixed driver to notice when reconnect_urls is dynamically changed
+Subject: [PATCH 25/39] BZ-614054 fixed parsing of failover URLs; fixed driver to notice when reconnect_urls is dynamically changed
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964044 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -94,5 +94,5 @@ index 44833f7..265cf7d 100644
log.warn("set reconnect_urls for conn %s: %s", conn, reconnect_urls)
--
-1.7.2
+1.7.2.2
diff --git a/0026-BZ-614344-default-ports-for-reconnect_urls.patch b/0026-BZ-614344-default-ports-for-reconnect_urls.patch
index 5eadc33..5130b72 100644
--- a/0026-BZ-614344-default-ports-for-reconnect_urls.patch
+++ b/0026-BZ-614344-default-ports-for-reconnect_urls.patch
@@ -1,7 +1,7 @@
From 0e2870b1d18706721055ddf73fc4e7a6b84cf674 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 14 Jul 2010 19:47:37 +0000
-Subject: [PATCH 26/34] BZ-614344 default ports for reconnect_urls
+Subject: [PATCH 26/39] BZ-614344 default ports for reconnect_urls
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@964151 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -33,5 +33,5 @@ index 1e1055a..9b34a46 100644
self._host = 0
result = hosts[self._host]
--
-1.7.2
+1.7.2.2
diff --git a/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch b/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
index e9fbe04..defe782 100644
--- a/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
+++ b/0027-BZ-620402-fixed-bug-in-flow-control-logic-added-test.patch
@@ -1,7 +1,7 @@
From 98d60f067c05a308f82b23fcdfa87494d783daa1 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 2 Aug 2010 12:10:52 +0000
-Subject: [PATCH 27/34] BZ-620402 fixed bug in flow control logic; added tests
+Subject: [PATCH 27/39] BZ-620402 fixed bug in flow control logic; added tests
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@981474 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -150,5 +150,5 @@ index bc17068..b360482 100644
self.rcv.capacity = UNLIMITED
self.assertAvailable(self.rcv, 0)
--
-1.7.2
+1.7.2.2
diff --git a/0028-BZ-621998-fixed-heartbeating.patch b/0028-BZ-621998-fixed-heartbeating.patch
index 2d82862..6637866 100644
--- a/0028-BZ-621998-fixed-heartbeating.patch
+++ b/0028-BZ-621998-fixed-heartbeating.patch
@@ -1,7 +1,7 @@
From e81d614bcfe0227d41f57e6f0ea2156bf057ca11 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Mon, 9 Aug 2010 11:53:25 +0000
-Subject: [PATCH 28/34] BZ-621998 fixed heartbeating
+Subject: [PATCH 28/39] BZ-621998 fixed heartbeating
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983597 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -156,5 +156,5 @@ index 27bc5af..0296d61 100644
class SessionError(MessagingError):
--
-1.7.2
+1.7.2.2
diff --git a/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch b/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
index daf3713..1082fb0 100644
--- a/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
+++ b/0029-Changed-conditional-assignment-to-vanilla-if-then-el.patch
@@ -1,7 +1,7 @@
From 688688c265d541a47aade8f4290af064a47ef286 Mon Sep 17 00:00:00 2001
From: Jonathan Robie <jonathan at apache.org>
Date: Mon, 9 Aug 2010 16:34:04 +0000
-Subject: [PATCH 29/34] Changed conditional assignment to vanilla if/then/else, for compatibility with older Python.
+Subject: [PATCH 29/39] Changed conditional assignment to vanilla if/then/else, for compatibility with older Python.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983718 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit 4b67ae91be27048aca8ded77b1089dd0487eff03)
@@ -32,5 +32,5 @@ index 4644189..a220fe7 100755
connection = Connection(broker)
--
-1.7.2
+1.7.2.2
diff --git a/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch b/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
index a482c5f..7719ab7 100644
--- a/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
+++ b/0030-Removed-finally-Python-before-2.5-did-not-allow-fina.patch
@@ -1,7 +1,7 @@
From 1ca7496b9db44598aabf63c729e8dde926805a81 Mon Sep 17 00:00:00 2001
From: Jonathan Robie <jonathan at apache.org>
Date: Mon, 9 Aug 2010 17:31:40 +0000
-Subject: [PATCH 30/34] Removed finally - Python before 2.5 did not allow finally together with specific exceptions.
+Subject: [PATCH 30/39] Removed finally - Python before 2.5 did not allow finally together with specific exceptions.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@983743 13f79535-47bb-0310-9956-ffa450edef68
(cherry picked from commit e3bc2893e6a3fae16079ba7bdcb034f3026fee76)
@@ -35,5 +35,5 @@ index 07c2b13..ab567ec 100755
+
+connection.close()
--
-1.7.2
+1.7.2.2
diff --git a/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch b/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
index dcd40ce..16f988a 100644
--- a/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
+++ b/0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
@@ -1,7 +1,7 @@
From 43af3b6d4ea16c8ecb3f9f954613b2785c5393b3 Mon Sep 17 00:00:00 2001
From: Kenneth Anthony Giusti <kgiusti at apache.org>
Date: Wed, 11 Aug 2010 14:46:39 +0000
-Subject: [PATCH 31/34] Bug 622699 - ManagementTest.test_broker_connectivity_oldAPI fails against standalone broker
+Subject: [PATCH 31/39] Bug 622699 - ManagementTest.test_broker_connectivity_oldAPI fails against standalone broker
Correctly parse replies containing multiple qmf messages.
@@ -55,5 +55,5 @@ index a23932a..3de8da9 100644
def exceptCb (self, ch, data):
if self.closeCb != None:
--
-1.7.2
+1.7.2.2
diff --git a/0032-BZ-621527-default-sasl-service-to-qpidd.patch b/0032-BZ-621527-default-sasl-service-to-qpidd.patch
index f062ce2..b54694b 100644
--- a/0032-BZ-621527-default-sasl-service-to-qpidd.patch
+++ b/0032-BZ-621527-default-sasl-service-to-qpidd.patch
@@ -1,7 +1,7 @@
From b1df1af4be83cc7606c115d9f330c4f9512a73eb Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 11 Aug 2010 11:41:59 +0000
-Subject: [PATCH 32/34] BZ-621527 default sasl service to qpidd
+Subject: [PATCH 32/39] BZ-621527 default sasl service to qpidd
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984382 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -23,5 +23,5 @@ index 5c1c8ad..8dbdc37 100644
self.sasl.setAttr("host", str(kwargs["host"]))
if "min_ssf" in kwargs:
--
-1.7.2
+1.7.2.2
diff --git a/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch b/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
index a912a51..8601fc9 100644
--- a/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
+++ b/0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
@@ -1,7 +1,7 @@
From 7f9f37995e204bee922195faf937b570a3c5beae Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Wed, 11 Aug 2010 11:58:49 +0000
-Subject: [PATCH 33/34] BZ-624715 fix error reporting for negotiation failure in sasl stub
+Subject: [PATCH 33/39] BZ-624715 fix error reporting for negotiation failure in sasl stub
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984386 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -39,5 +39,5 @@ index d4c15bd..fed6dea 100644
def step(self, challenge):
pass
--
-1.7.2
+1.7.2.2
diff --git a/0034-BZ-624714-fixed-reply-to-conversion.patch b/0034-BZ-624714-fixed-reply-to-conversion.patch
index ed35a24..21dae74 100644
--- a/0034-BZ-624714-fixed-reply-to-conversion.patch
+++ b/0034-BZ-624714-fixed-reply-to-conversion.patch
@@ -1,7 +1,7 @@
From 7e105a4f445dae7d506d12a135789d08854c3d30 Mon Sep 17 00:00:00 2001
From: Rafael H. Schloming <rhs at apache.org>
Date: Thu, 12 Aug 2010 18:37:19 +0000
-Subject: [PATCH 34/34] BZ-624714 fixed reply-to conversion
+Subject: [PATCH 34/39] BZ-624714 fixed reply-to conversion
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@984906 13f79535-47bb-0310-9956-ffa450edef68
---
@@ -75,5 +75,5 @@ index 526a5cf..eaa953e 100644
+ def testReplyToTopicSubject(self):
+ self.check_rt("name/subject; {node: {type: topic}}")
--
-1.7.2
+1.7.2.2
diff --git a/0035-Bug-632349-Python-Qpid-does-not-properly-encode-bool.patch b/0035-Bug-632349-Python-Qpid-does-not-properly-encode-bool.patch
new file mode 100644
index 0000000..77a162f
--- /dev/null
+++ b/0035-Bug-632349-Python-Qpid-does-not-properly-encode-bool.patch
@@ -0,0 +1,56 @@
+From 967cd8edda0e3027c2a26e3fe43e82099ec39357 Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Thu, 9 Sep 2010 18:49:35 +0000
+Subject: [PATCH 35/39] Bug 632349 - Python Qpid does not properly encode 'bool' in a Map message
+
+fixed bool encoding
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@995537 13f79535-47bb-0310-9956-ffa450edef68
+(cherry picked from commit b2645a3feaafd3ecb08669024debee3fdde922ff)
+---
+ qpid/python/qpid/codec010.py | 1 +
+ qpid/python/qpid/tests/messaging/message.py | 12 ++++++++++++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/qpid/python/qpid/codec010.py b/qpid/python/qpid/codec010.py
+index 682743d..d65f8c3 100644
+--- a/qpid/python/qpid/codec010.py
++++ b/qpid/python/qpid/codec010.py
+@@ -36,6 +36,7 @@ def map_str(s):
+ class Codec(Packer):
+
+ ENCODINGS = {
++ bool: direct("boolean"),
+ unicode: direct("str16"),
+ str: map_str,
+ buffer: direct("vbin32"),
+diff --git a/qpid/python/qpid/tests/messaging/message.py b/qpid/python/qpid/tests/messaging/message.py
+index eaa953e..297374b 100644
+--- a/qpid/python/qpid/tests/messaging/message.py
++++ b/qpid/python/qpid/tests/messaging/message.py
+@@ -86,6 +86,8 @@ class MessageEchoTests(Base):
+ "key7": ["one", 2, 3.14],
+ "key8": [],
+ "key9": {"sub-key0": 3},
++ "key10": True,
++ "key11": False,
+ "x-amqp-0-10.app-id": "test-app-id",
+ "x-amqp-0-10.content-encoding": "test-content-encoding"}
+
+@@ -141,3 +143,13 @@ class MessageEchoTests(Base):
+
+ def testReplyToTopicSubject(self):
+ self.check_rt("name/subject; {node: {type: topic}}")
++
++ def testBooleanEncoding(self):
++ msg = Message({"true": True, "false": False})
++ self.snd.send(msg)
++ echo = self.rcv.fetch(0)
++ self.assertEcho(msg, echo)
++ t = echo.content["true"]
++ f = echo.content["false"]
++ assert isinstance(t, bool), t
++ assert isinstance(f, bool), f
+--
+1.7.2.2
+
diff --git a/0036-BZ-632395-made-qpid.datatypes-module-use-builtin-UUI.patch b/0036-BZ-632395-made-qpid.datatypes-module-use-builtin-UUI.patch
new file mode 100644
index 0000000..7032b44
--- /dev/null
+++ b/0036-BZ-632395-made-qpid.datatypes-module-use-builtin-UUI.patch
@@ -0,0 +1,106 @@
+From b33b9e8a849b23d95c61226fec6529783c7c1e50 Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Fri, 10 Sep 2010 12:29:24 +0000
+Subject: [PATCH 36/39] BZ-632395 made qpid.datatypes module use builtin UUID when available
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@995770 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/codec010.py | 2 +-
+ qpid/python/qpid/datatypes.py | 58 ++++++++++++++++++++++-------------------
+ 2 files changed, 32 insertions(+), 28 deletions(-)
+
+diff --git a/qpid/python/qpid/codec010.py b/qpid/python/qpid/codec010.py
+index d65f8c3..5ad1ef1 100644
+--- a/qpid/python/qpid/codec010.py
++++ b/qpid/python/qpid/codec010.py
+@@ -357,7 +357,7 @@ class Codec(Packer):
+ getattr(self, attr)(n)
+
+ def read_uuid(self):
+- return UUID(self.unpack("16s"))
++ return UUID(bytes=self.unpack("16s"))
+ def write_uuid(self, s):
+ if isinstance(s, UUID):
+ s = s.bytes
+diff --git a/qpid/python/qpid/datatypes.py b/qpid/python/qpid/datatypes.py
+index c379293..ca1466c 100644
+--- a/qpid/python/qpid/datatypes.py
++++ b/qpid/python/qpid/datatypes.py
+@@ -286,10 +286,35 @@ class Future:
+ return self._set.isSet()
+
+ try:
+- import uuid
+- def random_uuid():
+- return uuid.uuid4().get_bytes()
++ from uuid import uuid4
++ from uuid import UUID
+ except ImportError:
++ class UUID:
++ def __init__(self, hex=None, bytes=None):
++ if [hex, bytes].count(None) != 1:
++ raise TypeErrror("need one of hex or bytes")
++ if bytes is not None:
++ self.bytes = bytes
++ elif hex is not None:
++ fields=hex.split("-")
++ fields[4:5] = [fields[4][:4], fields[4][4:]]
++ self.bytes = struct.pack("!LHHHHL", *[int(x,16) for x in fields])
++
++ def __cmp__(self, other):
++ if isinstance(other, UUID):
++ return cmp(self.bytes, other.bytes)
++ else:
++ return -1
++
++ def __str__(self):
++ return "%08x-%04x-%04x-%04x-%04x%08x" % struct.unpack("!LHHHHL", self.bytes)
++
++ def __repr__(self):
++ return "UUID(%r)" % str(self)
++
++ def __hash__(self):
++ return self.bytes.__hash__()
++
+ import os, random, socket, time
+ rand = random.Random()
+ rand.seed((os.getpid(), time.time(), socket.gethostname()))
+@@ -305,32 +330,11 @@ except ImportError:
+ bytes[8] |= 0x80
+ return "".join(map(chr, bytes))
+
+-def uuid4():
+- return UUID(random_uuid())
++ def uuid4():
++ return UUID(bytes=random_uuid())
+
+ def parseUUID(str):
+- fields=str.split("-")
+- fields[4:5] = [fields[4][:4], fields[4][4:]]
+- return UUID(struct.pack("!LHHHHL", *[int(x,16) for x in fields]))
+-
+-class UUID:
+- def __init__(self, bytes):
+- self.bytes = bytes
+-
+- def __cmp__(self, other):
+- if isinstance(other, UUID):
+- return cmp(self.bytes, other.bytes)
+- else:
+- return -1
+-
+- def __str__(self):
+- return "%08x-%04x-%04x-%04x-%04x%08x" % struct.unpack("!LHHHHL", self.bytes)
+-
+- def __repr__(self):
+- return "UUID(%r)" % str(self)
+-
+- def __hash__(self):
+- return self.bytes.__hash__()
++ return UUID(hex=str)
+
+ class timestamp(float):
+
+--
+1.7.2.2
+
diff --git a/0037-added-extra-assertion-to-check-that-deletion-of-defa.patch b/0037-added-extra-assertion-to-check-that-deletion-of-defa.patch
new file mode 100644
index 0000000..aba0a71
--- /dev/null
+++ b/0037-added-extra-assertion-to-check-that-deletion-of-defa.patch
@@ -0,0 +1,25 @@
+From 372d0dcff796b8dc8bffe693b4e49edca15f2cf4 Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Fri, 10 Sep 2010 14:24:20 +0000
+Subject: [PATCH 37/39] added extra assertion to check that deletion of default exchanges doesn't work
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@995803 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/tests/messaging/endpoints.py | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
+index b360482..185a90b 100644
+--- a/qpid/python/qpid/tests/messaging/endpoints.py
++++ b/qpid/python/qpid/tests/messaging/endpoints.py
+@@ -1029,6 +1029,7 @@ class AddressTests(Base):
+ snd.send("asdf")
+ try:
+ snd.close()
++ assert False, "successfully deleted amq.topic"
+ except SessionError, e:
+ assert "Cannot delete default exchange" in str(e)
+ # XXX: need to figure out close after error
+--
+1.7.2.2
+
diff --git a/0038-handle-request-timeout.patch b/0038-handle-request-timeout.patch
new file mode 100644
index 0000000..a25ebd5
--- /dev/null
+++ b/0038-handle-request-timeout.patch
@@ -0,0 +1,28 @@
+From 57ee214f689d6867d716589a8283045862a86dd7 Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Fri, 10 Sep 2010 14:58:08 +0000
+Subject: [PATCH 38/39] handle request timeout
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@995815 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/messaging/driver.py | 4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/qpid/python/qpid/messaging/driver.py b/qpid/python/qpid/messaging/driver.py
+index 0c7c7e7..bdcdb26 100644
+--- a/qpid/python/qpid/messaging/driver.py
++++ b/qpid/python/qpid/messaging/driver.py
+@@ -784,6 +784,10 @@ class Engine:
+ if sf.completed:
+ sst.write_op(SessionCompleted(sst.executed))
+
++ def do_session_request_timeout(self, rt):
++ sst = self.get_sst(rt)
++ sst.write_op(SessionTimeout(timeout=0))
++
+ def do_execution_result(self, er):
+ sst = self.get_sst(er)
+ sst.results[er.command_id] = er.value
+--
+1.7.2.2
+
diff --git a/0039-fixed-detach-to-not-hang-on-session-error-fixed-the-.patch b/0039-fixed-detach-to-not-hang-on-session-error-fixed-the-.patch
new file mode 100644
index 0000000..c15c093
--- /dev/null
+++ b/0039-fixed-detach-to-not-hang-on-session-error-fixed-the-.patch
@@ -0,0 +1,63 @@
+From a68cbe92e1b7b871588404afeb56f5809588773c Mon Sep 17 00:00:00 2001
+From: Rafael H. Schloming <rhs at apache.org>
+Date: Fri, 10 Sep 2010 17:26:23 +0000
+Subject: [PATCH 39/39] fixed detach to not hang on session error, fixed the tests to include a timeout for connection teardown
+
+git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@995884 13f79535-47bb-0310-9956-ffa450edef68
+---
+ qpid/python/qpid/messaging/endpoints.py | 1 +
+ qpid/python/qpid/tests/messaging/__init__.py | 5 ++++-
+ qpid/python/qpid/tests/messaging/endpoints.py | 2 +-
+ 3 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/qpid/python/qpid/messaging/endpoints.py b/qpid/python/qpid/messaging/endpoints.py
+index 7d7d424..886b7f1 100644
+--- a/qpid/python/qpid/messaging/endpoints.py
++++ b/qpid/python/qpid/messaging/endpoints.py
+@@ -261,6 +261,7 @@ class Connection(Endpoint):
+ def _unlinked(self):
+ return [l
+ for ssn in self.sessions.values()
++ if not (ssn.error or ssn.closed)
+ for l in ssn.senders + ssn.receivers
+ if not (l.linked or l.error or l.closed)]
+
+diff --git a/qpid/python/qpid/tests/messaging/__init__.py b/qpid/python/qpid/tests/messaging/__init__.py
+index ddacf77..8f6680d 100644
+--- a/qpid/python/qpid/tests/messaging/__init__.py
++++ b/qpid/python/qpid/tests/messaging/__init__.py
+@@ -56,7 +56,7 @@ class Base(Test):
+ self.conn = None
+
+ def teardown_connection(self, conn):
+- conn.close()
++ conn.close(timeout=self.timeout())
+
+ def content(self, base, count = None):
+ if count is None:
+@@ -159,6 +159,9 @@ class Base(Test):
+ def delay(self):
+ return float(self.config.defines.get("delay", "2"))
+
++ def timeout(self):
++ return float(self.config.defines.get("timeout", "60"))
++
+ def get_bool(self, name):
+ return self.config.defines.get(name, "false").lower() in ("true", "yes", "1")
+
+diff --git a/qpid/python/qpid/tests/messaging/endpoints.py b/qpid/python/qpid/tests/messaging/endpoints.py
+index 185a90b..6072311 100644
+--- a/qpid/python/qpid/tests/messaging/endpoints.py
++++ b/qpid/python/qpid/tests/messaging/endpoints.py
+@@ -710,7 +710,7 @@ class ReceiverTests(Base):
+
+ def fetchFromConcurrentCloseTest(self, entry):
+ def closer():
+- time.sleep(self.delay())
++ self.sleep()
+ entry.close()
+ t = Thread(target=closer)
+ t.start()
+--
+1.7.2.2
+
diff --git a/python-qpid.spec b/python-qpid.spec
index 66b6812..6d08cc5 100644
--- a/python-qpid.spec
+++ b/python-qpid.spec
@@ -3,7 +3,7 @@
Name: python-qpid
Version: 0.7.946106
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Python client library for AMQP
Group: Development/Python
@@ -47,7 +47,11 @@ Patch30: 0031-Bug-622699-ManagementTest.test_broker_connectivity_o.patch
Patch31: 0032-BZ-621527-default-sasl-service-to-qpidd.patch
Patch32: 0033-BZ-624715-fix-error-reporting-for-negotiation-failur.patch
Patch33: 0034-BZ-624714-fixed-reply-to-conversion.patch
-
+Patch34: 0035-Bug-632349-Python-Qpid-does-not-properly-encode-bool.patch
+Patch35: 0036-BZ-632395-made-qpid.datatypes-module-use-builtin-UUI.patch
+Patch36: 0037-added-extra-assertion-to-check-that-deletion-of-defa.patch
+Patch37: 0038-handle-request-timeout.patch
+Patch38: 0039-fixed-detach-to-not-hang-on-session-error-fixed-the-.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -93,6 +97,11 @@ The Apache Qpid Python client library for AMQP.
%patch31 -p3
%patch32 -p3
%patch33 -p3
+%patch34 -p3
+%patch35 -p3
+%patch36 -p3
+%patch37 -p3
+%patch38 -p3
%build
CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -116,6 +125,10 @@ rm -rf $RPM_BUILD_ROOT
%endif
%changelog
+* Mon Sep 13 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-14
+- Fix for bz632349
+- Fix for bz632395
+
* Tue Aug 17 2010 Rafael Schloming <rafaels at redhat.com> - 0.7.946106-13
- Fix for bz622699
- Fix for bz621527
More information about the scm-commits
mailing list