From 199bdab9674606e379654db00913cc27ff702a92 Mon Sep 17 00:00:00 2001 From: "Darryl L. Pierce" Date: Wed, 18 Sep 2013 21:15:16 +0000 Subject: QPID-4924: Fixed the Python examples to use the new Python module Now the imports will first attempt to bring in qpid_messaging, the Swig generated Python. If that fails it will then fall back to trying to import qpid.messaging, the pure Python binding. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1524572 13f79535-47bb-0310-9956-ffa450edef68 --- python/examples/api/drain | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'python/examples/api/drain') diff --git a/python/examples/api/drain b/python/examples/api/drain index 5e30153bc2..2b15a50500 100755 --- a/python/examples/api/drain +++ b/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 -- cgit v1.2.1