6 files changed, 54 insertions, 30 deletions
diff --git a/qpid/python/examples/api/drain b/qpid/python/examples/api/drain
index 5e30153bc2..2b15a50500 100755
--- a/qpid/python/examples/api/drain
+++ b/qpid/python/examples/api/drain
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +19,12 @@
 #
 
 import optparse
-from qpid.messaging import *
+
+try:
+  from qpid_messaging import *
+except:
+  from qpid.messaging import *
+
 from qpid.util import URL
 from qpid.log import enable, DEBUG, WARN
 
diff --git a/qpid/python/examples/api/hello b/qpid/python/examples/api/hello
index ad314da19e..52ea955093 100755
--- a/qpid/python/examples/api/hello
+++ b/qpid/python/examples/api/hello
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,15 +19,19 @@
 #
 
 import sys
-from qpid.messaging import *
+
+try:
+  from qpid_messaging import *
+except:
+  from qpid.messaging import *
 
 if len(sys.argv)<2:
-  broker =  "localhost:5672" 
+  broker =  "localhost:5672"
 else:
   broker = sys.argv[1]
 
-if len(sys.argv)<3: 
-  address = "amq.topic" 
+if len(sys.argv)<3:
+  address = "amq.topic"
 else:
   address = sys.argv[2]
 
diff --git a/qpid/python/examples/api/hello_xml b/qpid/python/examples/api/hello_xml
index ab567ec5dd..05fa5cc7ba 100755
--- a/qpid/python/examples/api/hello_xml
+++ b/qpid/python/examples/api/hello_xml
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +19,11 @@
 #
 
 import sys
-from qpid.messaging import *
+
+try:
+  from qpid_messaging import *
+except:
+  from qpid.messaging import *
 
 broker =  "localhost:5672"
 connection = Connection(broker)
@@ -41,11 +45,11 @@ try:
 
   address = """
     xml; {
-       create: always, 
-       node:{ type: queue }, 
-       link: { 
+       create: always,
+       node:{ type: queue },
+       link: {
          x-bindings: [{ exchange: xml, key: weather, arguments: { xquery: %r} }] 
-       } 
+       }
     }
     """ % query
 
diff --git a/qpid/python/examples/api/server b/qpid/python/examples/api/server
index 78d812bfd2..fb87951bad 100755
--- a/qpid/python/examples/api/server
+++ b/qpid/python/examples/api/server
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +19,12 @@
 #
 
 import optparse, sys, traceback
-from qpid.messaging import *
+
+try:
+  from qpid_messaging import *
+except:
+  from qpid.messaging import *
+
 from qpid.util import URL
 from subprocess import Popen, STDOUT, PIPE
 from qpid.log import enable, DEBUG, WARN
@@ -62,10 +67,10 @@ def dispatch(msg):
     result.properties["exit"] = proc.returncode
   elif msg_type == "eval":
     try:
-      content = eval(msg.content)
+      content = str(eval(msg.content))
     except:
       content = traceback.format_exc()
-    result = Message(content)
+    result = Message(content = content)
   else:
     result = Message("unrecognized message type: %s" % msg_type)
   return result
diff --git a/qpid/python/examples/api/spout b/qpid/python/examples/api/spout
index 6584b853fc..48921d4387 100755
--- a/qpid/python/examples/api/spout
+++ b/qpid/python/examples/api/spout
@@ -7,9 +7,9 @@
 # to you under the Apache License, Version 2.0 (the
 # "License"); you may not use this file except in compliance
 # with the License.  You may obtain a copy of the License at
-# 
+#
 #   http://www.apache.org/licenses/LICENSE-2.0
-# 
+#
 # Unless required by applicable law or agreed to in writing,
 # software distributed under the License is distributed on an
 # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -19,7 +19,13 @@
 #
 
 import optparse, time
-from qpid.messaging import *
+
+try:
+  from qpid_messaging import *
+  from uuid import uuid4
+except:
+  from qpid.messaging import *
+
 from qpid.util import URL
 from qpid.log import enable, DEBUG, WARN
 
diff --git a/qpid/python/examples/api/statistics.py b/qpid/python/examples/api/statistics.py
index e095920e90..089b81b740 100644
--- a/qpid/python/examples/api/statistics.py
+++ b/qpid/python/examples/api/statistics.py
@@ -48,16 +48,16 @@ class Throughput(Statistic):
         return "tp(m/s)"
 
     def report(self):
-	if self.started:
+        if self.started:
             elapsed = time.time() - self.start
             return str(int(self.messages/elapsed))
-	else:
-	    return "0"
+        else:
+            return "0"
 
 
 class ThroughputAndLatency(Throughput):
     def __init__(self):
-	Throughput.__init__(self)
+        Throughput.__init__(self)
         self.total = 0.0
         self.min = float('inf')
         self.max = -float('inf')
@@ -82,8 +82,8 @@ class ThroughputAndLatency(Throughput):
     def report(self):
         output = Throughput.report(self)
         if (self.samples > 0):
-	    output += "\t%.2f\t%.2f\t%.2f" %(self.min, self.max, self.total/self.samples)
-	return output
+            output += "\t%.2f\t%.2f\t%.2f" %(self.min, self.max, self.total/self.samples)
+            return output
 
 
 # Report batch and overall statistics