diff options
| author | Darryl L. Pierce <mcpierce@apache.org> | 2013-09-18 21:15:16 +0000 |
|---|---|---|
| committer | Darryl L. Pierce <mcpierce@apache.org> | 2013-09-18 21:15:16 +0000 |
| commit | ab0edc0c53f72b0f9dbd2d7d34d74cc4168c0744 (patch) | |
| tree | b54096fd0d0c59d8a7aaacc2e199d2e3445c73e5 /qpid/python/examples/api/drain | |
| parent | 012aba39d0204e3cd57dcf83e99d6d5bf9a0e74f (diff) | |
| download | qpid-python-ab0edc0c53f72b0f9dbd2d7d34d74cc4168c0744.tar.gz | |
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@1524572 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/python/examples/api/drain')
| -rwxr-xr-x | qpid/python/examples/api/drain | 11 |
1 files changed, 8 insertions, 3 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 |