Changelog and man-page updates.

Trundle · Trundle · commit bf3af6ce22dd · 2009-09-21T18:30:12.000+02:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -15,7 +15,8 @@ function.
 The history file is now really configurable. This issue was reported
 in Debian's bugtracker.
 
-bpython has now some basic support for Python 3 (requires Pygments >=1.1.1)
+bpython has now some basic support for Python 3 (requires Pygments >=1.1.1).
+As a result, setuptools is now optional.
 
 The pastebin URL is now configurable and the default pastebin is now
 bpaste.net
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1199,9 +1199,7 @@ def repl(self):
 
 # Use our own helper function because Python's will use real stdin and
 # stdout instead of our wrapped
-        self.push('from bpython import _internal\n')
-        self.push('help = _internal._help')
-        self.push('del _internal')
+        self.push('from bpython._internal import _help as help\n')
 
         self.iy, self.ix = self.scr.getyx()
         more = False
diff --git a/doc/bpython-config.5 b/doc/bpython-config.5
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH BPYTHON-CONFIG 5 "August 13, 2008"
+.TH BPYTHON-CONFIG 5 "September 21, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -22,45 +22,10 @@ config \- user configuration file for bpython
 .SH DESCRIPTION
 The 
 .B config
-contains various options controlling the behaviour of 
-.B bpython
- .
+contains various options controlling the behaviour of \fBbpython\fR.
 
-Boolean values are 
-.B True, False
-
-The various options are:
-
-.B auto_display_list 
-.BI boolean
-(default: True)
-.RS
-Display the autocomplete list as you type. When this is off, you can hit tab to see the suggestions.
-.RE
-
-.B syntax
-.BI boolean
-(default: True)
-.RS
-Syntax highlighting as you type.
-.RE
-
-.B arg_spec
-.BI boolean
-(default: True)
-.RS
-Display the arg spec (list of arguments) for callables, when possible.
-.RE
-
-.B tab_length
-.BI integer
-(default: 4)
-.RS
-The number of spaces a soft tab equals.
-.RE
-
-.SH SEE ALSO
-.BR bpython (1).
+See http://docs.bpython-interpreter.org/configuration.html for a full
+description of the configuration file.
 
 .SH AUTHOR
 bpython was written by Robert Anthony Farrell <robertanthonyfarrel@gmail.com> and his bunch of loyal followers.
diff --git a/doc/bpython.1 b/doc/bpython.1
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH BPYTHON 1 "August 13, 2008"
+.TH BPYTHON 1 "September 21, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -19,7 +19,7 @@
 bpython \- a fancy curses interface to the Python interactive interpreter
 .SH SYNOPSIS
 .B bpython
-.I ini file
+[\fIoptions\fR] [\fIfile\fR [\fIargs\fR]]
 .SH DESCRIPTION
 The idea is to provide the user with all the features
 in\-line, much like modern IDEs, but in a simple,
@@ -51,53 +51,55 @@ This posts the current buffer to a pastebin (paste.pocoo.org) or writes it to a
 Unlike other curses apps, bpython dumps the screen data to stdout when you quit, so you see what you've done in the buffer of your terminal.
 .RE
 
+.SH OPTIONS
+The long and short forms of options, shown here as alternatives, are
+equivalent. If bpython sees an argument it does not know, execution falls
+back to the regular Python interpreter.
+.IP "\fB\-c\fR \fIconfig\fR" 4
+.PD 0
+.IP "\fB\-\-config=\fR\fIconfig\fR" 4
+.PD
+Use \fIconfig\fR instead of default config file.
+.IP "\fB\-h\fR" 4
+.PD 0
+.IP "\fB\-\-help\fR" 4
+.PD
+Show the help message and exit.
+.IP "\fB\-i\fR" 4
+.PD 0
+.IP "\fB\-\-interactive\fR" 4
+.PD
+Drop to bpython shell after running \fIfile\fR instead of exiting.
+.IP "\fB\-q\fR" 4
+.PD 0
+.IP "\fB\-\-quiet\fR" 4
+.PD
+Do not flush the output to stdout.
+.IP "\fB\-V\fR" 4
+.PD 0
+.IP "\fB\-\-version\fR" 4
+.PD
+Print bpython's version and exit.
+
 .SH KEYS
-.B <C\-d>
-Exit
-.RS
-Exits the interpreter, like normal interactive Python.
-.RE
-.B <C\-r>
-Rewind
-.RS
-Rewinds and "undoes" the last statement, read 
-.B DESCRIPTION
-for more info.
-.RE
-.B <F2>
-Save
-.RS
-Saves the current buffer to a file.
-.RE
-.B <F8>
-Pastebin
-.RS
-Posts the current buffer to 
-.B http://paste.pocoo.org/
-(will probably become configurable), and displays the URL.
-.RE
-.B <Tab>
-Autocomplete
-.RS
-If there's an unambigious completion of the expression, fill it in.
-.RE
+bpython's keys are fully configurable. See
+http://docs.bpython-interpreter.org/configuration.html#keyboard
 
 .SH FILES
-~/.bpython.ini
+~/.bpython/config
 .RS
-Your bpython config. See sample.ini (in /usr/share/docs/bpython/examples on Debian) for various options you can use, or read
-.BR bpython.ini (5)
+Your bpython config. See sample-config (in /usr/share/docs/bpython/examples on Debian) for various options you can use, or read
+.BR bpython-config (5)
  .
 .RE
 
+.SH KNOWN BUGS
+See http://bitbucket.org/bobf/bpython/issues/ for a list of known issues.
+
 .SH SEE ALSO
-.BR bpython.ini (5),
+.BR bpython-config (5),
 .BR python (1).
 
-.SH KNOWN BUGS
-Triple quoted strings over multiple lines work, but they're not highlighted
-properly.
-
 .SH AUTHOR
 bpython was written by Robert Anthony Farrell <robertanthonyfarrel@gmail.com> and his bunch of loyal followers.
 .PP
