Drop "-c" config option as it conflicts with vanilla Python's "-c" option.

Trundle · Trundle · commit a387e8c26b4d · 2011-06-28T00:31:36.000+02:00
This closes issue bpython#186.
diff --git a/CHANGELOG b/CHANGELOG
@@ -16,6 +16,8 @@ Some issues have been resolved as well:
   which happens in some situations. See issue #94.
 * Non-ascii input should work now under Python 3.
 * Issue #165: C-a and C-e do the right thing now in urwid.
+* The short command-line option "-c config" was dropped as it conflicts with
+  vanilla Python's "-c command" option. See issue #186.
 
 v0.9.7.1
 --------
diff --git a/bpython/args.py b/bpython/args.py
@@ -58,7 +58,7 @@ def parse(args, extras=None, ignore_stdin=False):
     # That's probably fixable though, for example by having that
     # option swallow all remaining arguments in a callback.
     parser.disable_interspersed_args()
-    parser.add_option('--config', '-c', default=default_config_path(),
+    parser.add_option('--config', default=default_config_path(),
                       help='use CONFIG instead of default config file')
     parser.add_option('--interactive', '-i', action='store_true',
                       help='Drop to bpython shell after running file '
diff --git a/sample-config b/sample-config
@@ -1,7 +1,7 @@
 # This is a standard python config file
 # Valid values can be True, False, integer numbers, strings
-# By default bpython will look for ~/.bpython/config or you can specify a file
-# with the -c option on the command line
+# By default bpython will look for ~/.config/bpython/config or you
+# can specify a file with the --config option on the command line
 
 # General section tag
 [general]
