QPID-1067

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@657088 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 15 deletions

diff --git a/qpid/python/commands/qpid-tool b/qpid/python/commands/qpid-tool
index 32fdc9288b..478e362aaf 100755
--- a/qpid/python/commands/qpid-tool
+++ b/qpid/python/commands/qpid-tool
@@ -142,9 +142,6 @@ class Mcli (Cmd):
 def Usage ():
   print "Usage:", sys.argv[0], "[OPTIONS] [<target-host[:<tcp-port>]]"
   print
-  print "Options:"
-  print "    -s [ --spec-file ] PATH (/usr/share/amqp/amqp.0-10.xml)"
-  print
   sys.exit (1)
 
 #=========================================================
@@ -152,20 +149,10 @@ def Usage ():
 #=========================================================
 
 # Get host name and port if specified on the command line
-try:
-  longOpts = ("spec-file=")
-  (optlist, cargs) = getopt.gnu_getopt (sys.argv[1:], 's:', longOpts)
-except:
-  Usage ()
-  sys.exit (1)
+cargs = sys.argv[1:]
 
-_specpath = "/usr/share/amqp/amqp.0-10.xml"
 _host     = "localhost"
 
-for opt in optlist:
-  if opt[0] == "-s" or opt[0] == "--spec-file":
-    _specpath = opt[1]
-
 if len (cargs) > 0:
   _host = cargs[0]
 
@@ -173,7 +160,7 @@ disp = Display ()
 
 # Attempt to make a connection to the target broker
 try:
-  data = ManagementData (disp, _host, specfile=_specpath)
+  data = ManagementData (disp, _host)
 except socket.error, e:
   print "Socket Error (%s):" % _host, e[1]
   sys.exit (1)