- 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/qpid@656853 13f79535-47bb-0310-9956-ffa450edef68

3 files changed, 3 insertions, 21 deletions

diff --git a/python/examples/fanout/fanout_consumer.py b/python/examples/fanout/fanout_consumer.py
index 21fc5e8f16..15452390a0 100755
--- a/python/examples/fanout/fanout_consumer.py
+++ b/python/examples/fanout/fanout_consumer.py
@@ -22,7 +22,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)
@@ -35,14 +34,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/python/examples/fanout/fanout_producer.py b/python/examples/fanout/fanout_producer.py
index 43d6a94c3d..f5b589c861 100755
--- a/python/examples/fanout/fanout_producer.py
+++ b/python/examples/fanout/fanout_producer.py
@@ -21,7 +21,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)
@@ -34,14 +33,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/python/examples/fanout/listener.py b/python/examples/fanout/listener.py
index 50cd06d2a5..56acd50e10 100755
--- a/python/examples/fanout/listener.py
+++ b/python/examples/fanout/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()))