merge

bobf · bobf · commit 584921800da0 · 2009-06-05T19:47:00.000+01:00
diff --git a/README b/README
@@ -107,21 +107,15 @@ as you type.
 
 Configuration
 =============
-See the sample-rc file for a list of available options.
-You should save your rc file as ~/.bpythonrc or specify
+See the sample.ini file for a list of available options.
+You should save your ini file as ~/.bpython.ini or specify
 at the command line:
 
-bpython /path/to/bpythonrc
+bpython -c /path/to/bpython.ini
 
 Known Bugs
 ==========
-
-* Triple quoted strings over multiple lines work, but they're
-not highlighted properly.
-* Unicode schmunicode is in the works but will take some work
-to have curses play nice.
-
-For more known bugs please see bpython's issue tracker at
+For known bugs please see bpython's issue tracker at
 bitbucket:
 
 http://bitbucket.org/bobf/bpython/issues/
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# bpython 0.8.0::fancy curses interface to the Python repl::Bob Farrell 2008
 #
 # The MIT License
 #
@@ -23,9 +22,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 #
-# Requires at least Python 2.4, pygments and pyparsing
-# Debian/Ubuntu: aptitude install python-pyments python-pyparsing
-#
 
 from __future__ import with_statement
 
@@ -1383,7 +1379,7 @@ def strbase(self, l):
         elif len(l) == 1:
             return l[0]
 
-        sl = sorted(l, key=str.__len__)
+        sl = sorted(l, key=len)
         for i, c in enumerate(l[-1]):
 # I hate myself. Please email seamusmb@gmail.com to call him a dickhead for
 # insisting that I make bpython 2.4-compatible. I couldn't be bothered
