use optparse for option parsing

Trundle · Trundle · commit 9fd59a95b6c6 · 2009-06-03T02:22:19.000+02:00
Also added a --version command line option.
diff --git a/bpython/__init__.py b/bpython/__init__.py
@@ -19,3 +19,6 @@
 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
+
+
+__version__ = '0.9.1'
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -46,6 +46,7 @@
 import pydoc
 import types
 from cStringIO import StringIO
+from optparse import OptionParser
 from urlparse import urljoin
 from xmlrpclib import ServerProxy, Error as XMLRPCError
 from ConfigParser import ConfigParser, NoSectionError, NoOptionError
@@ -65,6 +66,8 @@
     Group, OneOrMore, ZeroOrMore, Literal, Optional, Word, \
     alphas, alphanums, printables, ParseException
 
+from bpython import __version__
+
 def log(x):
     f = open('/home/bob/tmp/bpython.out', 'a')
     f.write('%s\n' % (x,))
@@ -1794,7 +1797,7 @@ def migrate_rc(path):
 
 
 
-def loadini():
+def loadini(configfile):
     """Loads .ini configuration file and stores its values in OPTS"""
     class CP(ConfigParser):
         def safeget(self, section, option,  default):
@@ -1812,10 +1815,7 @@ def safeget(self, section, option,  default):
             except ValueError:
                 return v
 
-    if len(sys.argv) > 2:
-        configfile = sys.argv[2]
-    else:
-        configfile = os.path.expanduser('~/.bpython.ini')
+    configfile = os.path.expanduser(configfile)
 
     config = CP()
     config.read(configfile)
@@ -1887,7 +1887,24 @@ def main_curses(scr):
     return repl.getstdout()
 
 
-def main():
+def main(args=None):
+    if args is None:
+        args = sys.argv
+
+    parser = OptionParser()
+    parser.add_option('--config', '-c', default='~/.bpython.ini',
+                      help='use CONFIG instead of default config file')
+    parser.add_option('--version', '-V', action='store_true',
+                      help='print version and exit')
+
+    options, args = parser.parse_args(args)
+
+    if options.version:
+        print 'bpython version', __version__,
+        print 'on top of Python', sys.version.split()[0]
+        print '(C) 2008-2009 Bob Farrell et al. See AUTHORS for detail.'
+        return
+
     if not os.isatty(sys.stdin.fileno()):
         interpreter = code.InteractiveInterpreter()
         interpreter.runsource(sys.stdin.read())
@@ -1898,7 +1915,7 @@ def main():
     path = os.path.expanduser('~/.bpythonrc')   # migrating old configuration file
     if os.path.isfile(path):
         migrate_rc(path)
-    loadini()
+    loadini(options.config)
 
     try:
         o = curses.wrapper(main_curses)
diff --git a/setup.py b/setup.py
@@ -8,14 +8,16 @@
 import re
 import sys
 
+from bpython import __version__
+
 if platform.system() == 'FreeBSD':
     man_dir = 'man'
 else:
     man_dir = 'share/man'
 
 setup(
     name="bpython",
-    version = "0.9.1",
+    version = __version__,
     author = "Robert Anthony Farrell",
     author_email = "robertanthonyfarrell@gmail.com",
     description = "Fancy Interface to the Python Interpreter",
