QPID-7669: Unintended UI changes from switch to swigged Python client for management tools
Reverted the qpid management scripts to use the native python client. The SWIG
client introduces incompatible changes (URL formats, SASL configuration) in
addition to support form AMQP 1.0, which breaks existing use.
The libqpidtools library still supports both native and SWIG client so 3rd-party
AMQP 1.0 tools built using the libqpidtools are not affected.
diff --git a/management/python/bin/qpid-config b/management/python/bin/qpid-config
index 3055419..d19b039 100755
--- a/management/python/bin/qpid-config
+++ b/management/python/bin/qpid-config
@@ -28,11 +28,7 @@
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
-try:
- from qpid_messaging import Connection, ConnectionError
-except:
- from qpid.messaging import Connection, ConnectionError
-
+from qpid.messaging import Connection, ConnectionError
from qpidtoollibs import BrokerAgent, Display, Header
usage = """
diff --git a/management/python/bin/qpid-ha b/management/python/bin/qpid-ha
index 88116ca..d2377bb 100755
--- a/management/python/bin/qpid-ha
+++ b/management/python/bin/qpid-ha
@@ -20,10 +20,7 @@
#
import optparse, sys, time, os, re, math
-try:
- from qpid_messaging import Connection
-except:
- from qpid.messaging import Connection
+from qpid.messaging import Connection
from qpid.util import URL
from qpidtoollibs.broker import BrokerAgent
from qpidtoollibs.config import parse_qpidd_conf
diff --git a/management/python/bin/qpid-printevents b/management/python/bin/qpid-printevents
index 7181fc9..b60cb3f 100755
--- a/management/python/bin/qpid-printevents
+++ b/management/python/bin/qpid-printevents
@@ -25,10 +25,7 @@
from optparse import IndentedHelpFormatter
from time import time, strftime, gmtime, sleep
from threading import Lock, Condition, Thread
-try:
- from qpid_messaging import Connection, exceptions
-except:
- from qpid.messaging import Connection, exceptions
+from qpid.messaging import Connection, exceptions
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
diff --git a/management/python/bin/qpid-receive b/management/python/bin/qpid-receive
index a055b4f..f14df27 100755
--- a/management/python/bin/qpid-receive
+++ b/management/python/bin/qpid-receive
@@ -20,10 +20,7 @@
import optparse, sys, time
import statistics
-try:
- from qpid_messaging import *
-except:
- from qpid.messaging import *
+from qpid.messaging import *
SECOND = 1000
TIME_SEC = 1000000000
diff --git a/management/python/bin/qpid-send b/management/python/bin/qpid-send
index 2268541..b0105e4 100755
--- a/management/python/bin/qpid-send
+++ b/management/python/bin/qpid-send
@@ -18,11 +18,9 @@
# under the License.
#
-import optparse, random, os, time, uuid, statistics
-try:
- from qpid_messaging import *
-except:
- from qpid.messaging import *
+import optparse, random, os, time, uuid
+from qpid.messaging import *
+import statistics
EOS = "eos"
SN = "sn"
diff --git a/management/python/bin/qpid-stat b/management/python/bin/qpid-stat
index 1bff8ad..1780c4a 100755
--- a/management/python/bin/qpid-stat
+++ b/management/python/bin/qpid-stat
@@ -25,11 +25,7 @@
import locale
import socket
import re
-
-try:
- from qpid_messaging import Connection
-except:
- from qpid.messaging import Connection
+from qpid.messaging import Connection
home = os.environ.get("QPID_TOOLS_HOME", os.path.normpath("/usr/share/qpid-tools"))
sys.path.append(os.path.join(home, "python"))
