Merge lp:~kkulaj/beeseek/testing into lp:beeseek

[Krzysztof Kułaj]

[Andrea Corbellini (andrea.corbellini)]

Your branch is fine. As we discussed on IRC, there are just a few cosmetic changes to do. Thank you! :-)

review: Approve

Unmerged revisions

126. By sajan <sajan@sajan-laptop> on 2011-03-17

resolving conflict

125. By sajan <sajan@sajan-laptop> on 2011-03-17

replacing optparse with argparse

=== modified file 'node/bsnode/main.py'
--- node/bsnode/main.py	2011-03-11 18:39:57 +0000
+++ node/bsnode/main.py	2011-03-17 19:31:06 +0000
@@ -1,10 +1,10 @@
-# Copyright 2010-2011 BeeSeek Developers.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file COPYING).
+# Copyright 2010 BeeSeek Developers.  This software is licensed under the
+# GNU Affero General Public License version 3 (see the file LICENSE.node).
 
 """Module with functions to start and stop the service."""
 
 from __future__ import print_function
-import optparse
+import argparse
 from bsnode import settings, webserver
 from bsnode.version import program_version, format_version
 
@@ -12,38 +12,26 @@
     """Parse the command line arguments.
 
     >>> import sys
-    >>> sys.stderr = sys.stdout
     >>> options = parse_options(['-d'])
     >>> options #doctest:+ELLIPSIS
-    <Values at 0x...: {...}>
+    Namespace(debug=True, verbose=False, version=False)
     >>> options.debug
     True
     >>> options.version
     False
     """
-    parser = optparse.OptionParser()
-    parser.add_option('-d', '--debug',
-        help='enable debugging',
-        action='store_true', default=False)
-    parser.add_option('-v', '--verbose',
-        help='be verbose',
-        action='store_true', default=False)
-    parser.add_option('-V', '--version',
-        help='display version information and exit',
-        action='store_true', default=False)
+    parser = argparse.ArgumentParser()
+    parser.add_argument('-d','--debug', dest='debug', action='store_true', default=False, help='enable debugging')
+    parser.add_argument('-v', '--verbose',dest='verbose', action='store_true', default=False, help='be verbose') 
+    parser.add_argument('-V', '--version',dest='version', action='store_true', default=False, help='display version information and exit')
 
-    try:
-        options, args = parser.parse_args(args)
-        if args:
-            parser.error('the application takes no arguments')
-    except SystemExit as exc:
-        return exc[0]
-    return options
+    return parser.parse_args(args)
 
 def start(args=None):
     """Start the service with `args` and return the exit status.
 
-    This function will first parse the command line arguments, start and bind
+    This function will first parse the command line arguments, then set up the
+    `DJANGO_SETTINGS_MODULE` environment variable and finally start and bind
     the web server.
 
     >>> status = start(['--version']) #doctest:+ELLIPSIS
@@ -51,6 +39,7 @@
     >>> status
     0
     """
+
     options = parse_options(args)
     if isinstance(options, int):
         # This is actually the exit status.
@@ -60,6 +49,7 @@
     settings.DEBUG = options.debug
     settings.TEMPLATE_DEBUG = options.debug
     settings.VERBOSE = options.verbose
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'bsnode.settings'
 
     if options.version:
         # Show the version number.