Ticket #1713: toolbox-no-ipv6-default.diff

turbogears/command/base.py

@@ -241 +241 @@
     desc = "Launch the TurboGears Toolbox"
 
     def __init__(self, version):
-        self.hostlist = ['127.0.0.1','::1']
+        self.hostlist = ['127.0.0.1', '::1', '::ffff:127.0.0.1']
 
-        parser = optparse.OptionParser(
-            usage="%prog toolbox [options]", version="%prog " + version)
+        parser = optparse.OptionParser(usage="%prog toolbox [options]",
+            version="%prog " + version, description=self.desc)
         parser.add_option("-n", "--no-open",
-                 help="don't open browser automatically",
-                 dest="noopen", action="store_true",
-                 default=False)
+            help="don't open browser automatically",
+            dest="noopen", action="store_true",
+            default=False)
         parser.add_option("-c", "--add-client",
-                help="allow the client ip address specified to connect to toolbox (Can be specified more than once)",
-                dest="host", action="append", default=None)
+            help="allow the client ip address specified to connect to toolbox (Can be specified more than once)",
+            dest="clients", metavar="ADDR", action="append", default=None)
+        parser.add_option("-s", "--server-address",
+            help="interface address to run the Toolbox on (default: 0.0.0.0)",
+            dest="host", metavar="ADDR", default='0.0.0.0')
         parser.add_option("-p", "--port",
-                help="port to run the Toolbox on", dest="port", default=7654)
+            help="port to run the Toolbox on", dest="port", default=7654)
         parser.add_option("--conf", help="config file to use",
-                dest="config", default=get_project_config())
+            dest="config", default=get_project_config())
 
         (options, args) = parser.parse_args(sys.argv[1:])
+        self.host = options.host
         self.port = int(options.port)
         self.noopen = options.noopen
         self.config = options.config
 
-        if options.host:
-            self.hostlist = self.hostlist + options.host
+        if options.clients:
+            self.hostlist = self.hostlist + options.clients
 
         turbogears.widgets.load_widgets()
 
     def openbrowser(self):
         import webbrowser
-        webbrowser.open("http://localhost:%d" % self.port)
+        webbrowser.open("http://%s:%d" % (self.host, self.port))
 
     def run(self):
         import cherrypy
@@ -293 +297 @@
         # amend some parameters since we are running from the command
         # line in order to change port, log methods...
         config.update({"global" : {
+            "server.socket_host" : self.host,
             "server.socket_port" : self.port,
             "server.environment" : "development",
             "server.log_to_screen" : True,