s/optparse/argparse

Author: benoitc

gunicorn/app/base.py

@@ -20,10 +20,11 @@ class Application(object):
     the various necessities for any given web framework.
     """
 
-    def __init__(self, usage=None):
+    def __init__(self, usage=None, prog=None):
         self.usage = usage
         self.cfg = None
         self.callable = None
+        self.prog = prog
         self.logger = None
         self.do_load_config()
 
@@ -32,38 +33,39 @@ def do_load_config(self):
             self.load_config()
         except Exception as e:
             sys.stderr.write("\nError: %s\n" % str(e))
+            traceback.print_exc()
             sys.stderr.flush()
             sys.exit(1)
 
     def load_config(self):
         # init configuration
-        self.cfg = Config(self.usage)
+        self.cfg = Config(self.usage, prog=self.prog)
 
         # parse console args
         parser = self.cfg.parser()
-        opts, args = parser.parse_args()
+        args = parser.parse_args()
 
         # optional settings from apps
-        cfg = self.init(parser, opts, args)
+        cfg = self.init(parser, args, args.args)
 
         # Load up the any app specific configuration
         if cfg and cfg is not None:
             for k, v in cfg.items():
                 self.cfg.set(k.lower(), v)
 
         # Load up the config file if its found.
-        if opts.config and os.path.exists(opts.config):
+        if args.config and os.path.exists(args.config):
             cfg = {
                 "__builtins__": __builtins__,
                 "__name__": "__config__",
-                "__file__": opts.config,
+                "__file__": args.config,
                 "__doc__": None,
                 "__package__": None
             }
             try:
-                execfile_(opts.config, cfg, cfg)
+                execfile_(args.config, cfg, cfg)
             except Exception:
-                print("Failed to read config file: %s" % opts.config)
+                print("Failed to read config file: %s" % args.config)
                 traceback.print_exc()
                 sys.exit(1)
 
@@ -79,9 +81,11 @@ def load_config(self):
 
         # Lastly, update the configuration with any command line
         # settings.
-        for k, v in opts.__dict__.items():
+        for k, v in args.__dict__.items():
             if v is None:
                 continue
+            if k == "args":
+                continue
             self.cfg.set(k.lower(), v)
 
     def init(self, parser, opts, args):

gunicorn/app/djangoapp.py

@@ -105,13 +105,13 @@ class DjangoApplicationCommand(Application):
 
     def __init__(self, options, admin_media_path):
         self.usage = None
+        self.prog = None
         self.cfg = None
         self.config_file = options.get("config") or ""
         self.options = options
         self.admin_media_path = admin_media_path
         self.callable = None
         self.project_path = None
-
         self.do_load_config()
 
     def init(self, *args):
@@ -139,4 +139,4 @@ def run():
     applications.
     """
     from gunicorn.app.djangoapp import DjangoApplication
-    DjangoApplication("%prog [OPTIONS] [SETTINGS_PATH]").run()
+    DjangoApplication("%(prog)s [OPTIONS] [SETTINGS_PATH]").run()

gunicorn/app/pasterapp.py

@@ -147,7 +147,7 @@ def run():
     apllications like Pylons or Turbogears2
     """
     from gunicorn.app.pasterapp import PasterApplication
-    PasterApplication("%prog [OPTIONS] pasteconfig.ini").run()
+    PasterApplication("%(prog)s [OPTIONS] pasteconfig.ini").run()
 
 
 def paste_server(app, gcfg=None, host="127.0.0.1", port=None, *args, **kwargs):

gunicorn/app/wsgiapp.py

@@ -31,4 +31,4 @@ def run():
     generic WSGI applications.
     """
     from gunicorn.app.wsgiapp import WSGIApplication
-    WSGIApplication("%prog [OPTIONS] APP_MODULE").run()
+    WSGIApplication("%(prog)s [OPTIONS] APP_MODULE").run()