From ca3bc30a4ff5fbd2504b2868eea60e647b16b2d8 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 15 May 2008 21:34:10 +0000 Subject: - Enable python tets and examples in make rpmbuild. - Remove hard-coded amqp.xml paths from python examples. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@656853 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/python/examples/xml-exchange/declare_queues.py | 8 +------- qpid/python/examples/xml-exchange/listener.py | 8 +------- qpid/python/examples/xml-exchange/xml_consumer.py | 8 +------- qpid/python/examples/xml-exchange/xml_producer.py | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) (limited to 'qpid/python/examples/xml-exchange') diff --git a/qpid/python/examples/xml-exchange/declare_queues.py b/qpid/python/examples/xml-exchange/declare_queues.py index d3bf4d359e..8985c20cab 100755 --- a/qpid/python/examples/xml-exchange/declare_queues.py +++ b/qpid/python/examples/xml-exchange/declare_queues.py @@ -25,7 +25,6 @@ host="127.0.0.1" port=5672 user="guest" password="guest" -amqp_spec="/usr/share/amqp/amqp.0-10.xml" # If an alternate host or port has been specified, use that instead # (this is used in our unit tests) @@ -38,14 +37,9 @@ if len(sys.argv) > 1 : if len(sys.argv) > 2 : port=int(sys.argv[2]) -try: - amqp_spec = os.environ["AMQP_SPEC"] -except KeyError: - amqp_spec="/usr/share/amqp/amqp.0-10.xml" - # Create a connection. socket = connect(host, port) -connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec)) +connection = Connection (sock=socket) connection.start() session = connection.session(str(uuid4())) diff --git a/qpid/python/examples/xml-exchange/listener.py b/qpid/python/examples/xml-exchange/listener.py index cdc00a7015..f2f9105091 100755 --- a/qpid/python/examples/xml-exchange/listener.py +++ b/qpid/python/examples/xml-exchange/listener.py @@ -42,7 +42,6 @@ host="127.0.0.1" port=5672 user="guest" password="guest" -amqp_spec="/usr/share/amqp/amqp.0-10.xml" # If an alternate host or port has been specified, use that instead # (this is used in our unit tests) @@ -55,14 +54,9 @@ if len(sys.argv) > 1 : if len(sys.argv) > 2 : port=int(sys.argv[2]) -try: - amqp_spec = os.environ["AMQP_SPEC"] -except KeyError: - amqp_spec="/usr/share/amqp/amqp.0-10.xml" - # Create a connection. socket = connect(host, port) -connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec)) +connection = Connection (sock=socket) connection.start() session = connection.session(str(uuid4())) diff --git a/qpid/python/examples/xml-exchange/xml_consumer.py b/qpid/python/examples/xml-exchange/xml_consumer.py index c210a4342c..047faec668 100755 --- a/qpid/python/examples/xml-exchange/xml_consumer.py +++ b/qpid/python/examples/xml-exchange/xml_consumer.py @@ -24,7 +24,6 @@ host="127.0.0.1" port=5672 user="guest" password="guest" -amqp_spec="/usr/share/amqp/amqp.0-10.xml" # If an alternate host or port has been specified, use that instead # (this is used in our unit tests) @@ -37,14 +36,9 @@ if len(sys.argv) > 1 : if len(sys.argv) > 2 : port=int(sys.argv[2]) -try: - amqp_spec = os.environ["AMQP_SPEC"] -except KeyError: - amqp_spec="/usr/share/amqp/amqp.0-10.xml" - # Create a connection. socket = connect(host, port) -connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec)) +connection = Connection (sock=socket) connection.start() session = connection.session(str(uuid4())) diff --git a/qpid/python/examples/xml-exchange/xml_producer.py b/qpid/python/examples/xml-exchange/xml_producer.py index 9e609ed132..435045b0fa 100755 --- a/qpid/python/examples/xml-exchange/xml_producer.py +++ b/qpid/python/examples/xml-exchange/xml_producer.py @@ -42,7 +42,6 @@ host="127.0.0.1" port=5672 user="guest" password="guest" -amqp_spec="/usr/share/amqp/amqp.0-10.xml" # If an alternate host or port has been specified, use that instead # (this is used in our unit tests) @@ -55,14 +54,9 @@ if len(sys.argv) > 1 : if len(sys.argv) > 2 : port=int(sys.argv[2]) -try: - amqp_spec = os.environ["AMQP_SPEC"] -except KeyError: - amqp_spec="/usr/share/amqp/amqp.0-10.xml" - # Create a connection. socket = connect(host, port) -connection = Connection (sock=socket, spec=qpid.spec.load(amqp_spec)) +connection = Connection (sock=socket) connection.start() session = connection.session(str(uuid4())) -- cgit v1.2.1