change --type to --paste for initial paste

thomasballinger · thomasballinger · commit e32e8e8b35ea · 2015-02-13T12:33:15.000-05:00
diff --git a/bpython/curtsies.py b/bpython/curtsies.py
@@ -34,8 +34,8 @@ def main(args=None, locals_=None, banner=None):
         'curtsies options', None, [
             Option('--log', '-L', action='count',
                    help=_("log debug messages to bpython.log")),
-            Option('--type', '-t', action='store_true',
-                   help=_("enter lines of file as though interactively "
+            Option('--paste', '-p', action='store_true',
+                   help=_("start by pasting lines of a file into session"
                           "typed")),
             ]))
     if options.log is None:
@@ -57,7 +57,7 @@ def main(args=None, locals_=None, banner=None):
         if not options:
             raise ValueError("don't pass in exec_args without options")
         exit_value = 0
-        if options.type:
+        if options.paste:
             paste = curtsies.events.PasteEvent()
             encoding = inspection.get_encoding_file(exec_args[0])
             with io.open(exec_args[0], encoding=encoding) as f:
diff --git a/doc/sphinx/source/man-bpython.rst b/doc/sphinx/source/man-bpython.rst
@@ -58,7 +58,7 @@ the regular Python interpreter.
 -V, --version          Print :program:`bpython`'s version and exit.
 -L, --log              Write debugging messages to the file bpython.log. Use
                        -LL for more verbose logging. Only available in :program:`bpython`.
--t file, --type=file   Paste in the contents of a file at startup. Only available in :program:`bpython`.
+-p file, --paste=file  Paste in the contents of a file at startup. Only available in :program:`bpython`.
 
 In addition to the above options, :program:`bpython-urwid` also supports the
 following options if Twisted is available:
