Corrected datatypes of numeric defaults for optparse.

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

4 files changed, 6 insertions, 6 deletions

diff --git a/tools/src/py/qpid-cluster b/tools/src/py/qpid-cluster
index ae52670ef6..aabf460da0 100755
--- a/tools/src/py/qpid-cluster
+++ b/tools/src/py/qpid-cluster
@@ -239,7 +239,7 @@ def main(argv=None):
         parser = OptionParser(usage="usage: %prog [options] BROKER",
                       description="Example: $ qpid-cluster -C  broker-host:10000")
 
-        parser.add_option("-t", "--timeout", action="store", type="int", default="10", metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
+        parser.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
         parser.add_option("-C", "--all-connections", action="store_true", default=False, help="View client connections to all cluster members")
         parser.add_option("-c", "--connections",  metavar="ID", help="View client connections to specified member")
         parser.add_option("-d", "--del-connection",  metavar="HOST:PORT", help="Disconnect a client connection")
diff --git a/tools/src/py/qpid-config b/tools/src/py/qpid-config
index d162e34fa4..28581daae9 100755
--- a/tools/src/py/qpid-config
+++ b/tools/src/py/qpid-config
@@ -442,7 +442,7 @@ parser = OptionParser(usage=usage,
                       formatter=JHelpFormatter())
 
 group1 = OptionGroup(parser, "General Options")
-group1.add_option("-t", "--timeout", action="store", type="int", default="10", metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
+group1.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
 group1.add_option("-b", "--bindings", action="store_true", help="Show bindings in queue or exchange list")
 group1.add_option("-a", "--broker-addr", action="store", type="string", default="localhost:5672", metavar="ADDRESS", help="Maximum time to wait for broker connection (in seconds)")
 parser.add_option_group(group1)
@@ -455,8 +455,8 @@ parser.add_option_group(group2)
 
 group3 = OptionGroup(parser, "Options for Adding Queues")
 group3.add_option("--cluster-durable", action="store_true", help="The new queue becomes durable if there is only one functioning cluster node")
-group3.add_option("--file-count", action="store", type="int", default="8", metavar="N", help="Number of files in queue's persistence journal")
-group3.add_option("--file-size", action="store", type="int", default="24", metavar="N", help="File size in pages (64Kib/page)")
+group3.add_option("--file-count", action="store", type="int", default=8, metavar="N", help="Number of files in queue's persistence journal")
+group3.add_option("--file-size", action="store", type="int", default=24, metavar="N", help="File size in pages (64Kib/page)")
 group3.add_option("--max-queue-size", action="store", type="int", metavar="N", help="Number of files in queue's persistence journal")
 group3.add_option("--max-queue-count", action="store", type="int", metavar="N", help="Number of files in queue's persistence journal")
 group3.add_option("--limit-policy", action="store", choices=["none", "reject", "flow-to-disk", "ring", "ring-strict"], metavar="CHOICE", help="Action to take when queue limit is reached")
diff --git a/tools/src/py/qpid-route b/tools/src/py/qpid-route
index d60574667d..db0fca679e 100755
--- a/tools/src/py/qpid-route
+++ b/tools/src/py/qpid-route
@@ -423,7 +423,7 @@ parser = OptionParser(usage=usage,
                       description=description,
                       formatter=JHelpFormatter())
 
-parser.add_option("--timeout", action="store", type="int", default="10", metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
+parser.add_option("--timeout", action="store", type="int", default=10, metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
 parser.add_option("-v", "--verbose", action="store_true", help="Verbose output")
 parser.add_option("-q", "--quiet", action="store_true", help="Quiet output, don't print duplicate warnings")
 parser.add_option("-d", "--durable", action="store_true", help="Added configuration shall be durable")
diff --git a/tools/src/py/qpid-stat b/tools/src/py/qpid-stat
index bb2764aaa9..9229fbec29 100755
--- a/tools/src/py/qpid-stat
+++ b/tools/src/py/qpid-stat
@@ -448,7 +448,7 @@ parser = OptionParser(usage="usage: %prog [options] BROKER",
                       description="Example: $ qpid-stat -q  broker-host:10000")
 
 group1 = OptionGroup(parser, "General Options")
-group1.add_option("-t", "--timeout", action="store", type="int", default="10", metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
+group1.add_option("-t", "--timeout", action="store", type="int", default=10, metavar="SECS", help="Maximum time to wait for broker connection (in seconds)")
 parser.add_option_group(group1)
 
 group2 = OptionGroup(parser, "Display Options")