Merge in main branch to stay up to date

ikanobori · ikanobori · commit 318e93d742ed · 2010-02-15T21:06:08.000+01:00
diff --git a/AUTHORS b/AUTHORS
@@ -8,6 +8,6 @@ Other contributors are (in alphabetical order):
 * Federico Ceratto <federico dot ceratto at gmail dot com>
 * Pavel Panchekha <pavpanchekha at gmail dot com>
 * Simon de Vlieger <simon at ikanobori dot jp>
-
+* Marien Zwart <marien dot zwart at gmail dot com>
 
 Many thanks for all contributions!
diff --git a/ROADMAP b/ROADMAP
@@ -22,3 +22,7 @@ bpython.gtk_
 
 common
 - test suite
+
+v1.0
+----
+- Ditch curses for an urwid/twisted loop
diff --git a/bpython/args.py b/bpython/args.py
@@ -7,11 +7,20 @@
 import sys
 import code
 from optparse import OptionParser, OptionGroup
-from itertools import takewhile
 
 from bpython import __version__
 from bpython.config import loadini, Struct, migrate_rc
 
+
+class OptionParserFailed(ValueError):
+    """Raised by the RaisingOptionParser for a bogus commandline."""
+
+
+class RaisingOptionParser(OptionParser):
+    def error(self, msg):
+        raise OptionParserFailed()
+
+
 def parse(args, extras=None):
     """Receive an argument list - if None, use sys.argv - parse all args and
     take appropriate action. Also receive optional extra options: this should
@@ -39,10 +48,16 @@ def parse(args, extras=None):
     if args is None:
         args = sys.argv[1:]
 
-    parser = OptionParser(usage='Usage: %prog [options] [file [args]]\n'
-                                'NOTE: If bpython sees an argument it does '
-                                 'not know, execution falls back to the '
-                                 'regular Python interpreter.')
+    parser = RaisingOptionParser(
+        usage='Usage: %prog [options] [file [args]]\n'
+        'NOTE: If bpython sees an argument it does '
+        'not know, execution falls back to the '
+        'regular Python interpreter.')
+    # This is not sufficient if bpython gains its own -m support
+    # (instead of falling back to Python itself for that).
+    # 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='~/.bpython/config',
                       help='use CONFIG instead of default config file')
     parser.add_option('--interactive', '-i', action='store_true',
@@ -59,17 +74,11 @@ def parse(args, extras=None):
             extras_group.add_option(option)
         parser.add_option_group(extras_group)
 
-    all_args = set(parser._short_opt.keys() + parser._long_opt.keys())
-    if args and not all_args.intersection(arg.split('=')[0] for arg in args):
+    try:
+        options, args = parser.parse_args(args)
+    except OptionParserFailed:
         # Just let Python handle this
         os.execv(sys.executable, [sys.executable] + args)
-    else:
-        # Split args in bpython args and args for the executed file
-        real_args = list(takewhile(lambda arg: arg.split('=')[0] in all_args,
-                                   args))
-        exec_args = args[len(real_args):]
-
-    options, args = parser.parse_args(real_args)
 
     if options.version:
         print 'bpython version', __version__,
@@ -91,7 +100,7 @@ def parse(args, extras=None):
 
     loadini(config, options.config)
 
-    return config, options, exec_args
+    return config, options, args
 
 def exec_code(interpreter, args):
     """
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -240,7 +240,7 @@ def make_colors(config):
 class CLIRepl(Repl):
 
     def __init__(self, scr, interp, statusbar, config, idle=None):
-        Repl.__init__(self, interp, config, idle)
+        Repl.__init__(self, interp, config)
         interp.writetb = self.writetb
         self.scr = scr
         self.list_win = newwin(get_colpair(config, 'background'), 1, 1, 1, 1)
@@ -253,6 +253,7 @@ def __init__(self, scr, interp, statusbar, config, idle=None):
         self.last_key_press = time.time()
         self.s = ''
         self.statusbar = statusbar
+        self.formatter = BPythonFormatter(config.color_scheme)
 
     def addstr(self, s):
         """Add a string to the current input line and figure out
@@ -462,13 +463,6 @@ def echo(self, s, redraw=True):
         # Replace NUL bytes, as addstr raises an exception otherwise
         s = s.replace('\x00', '')
 
-        screen_height, screen_width = self.scr.getmaxyx()
-        if self.iy >= (screen_height - 1):
-            lines = (self.ix + len(s)) // screen_width
-            if lines > 0:
-                self.scr.scroll(lines)
-                self.iy -= lines
-                self.scr.move(self.iy, self.ix)
         self.scr.addstr(s, a)
 
         if redraw and not self.evaluating:
@@ -865,8 +859,7 @@ def print_line(self, s, clr=False, newline=False):
             self.highlighted_paren = None
 
         if self.config.syntax and (not self.paste_mode or newline):
-            o = format(self.tokenize(s, newline),
-                       BPythonFormatter(self.config.color_scheme))
+            o = format(self.tokenize(s, newline), self.formatter)
         else:
             o = s
 
@@ -1622,6 +1615,7 @@ def main(args=None, locals_=None, banner=None):
 
 
 if __name__ == '__main__':
+    from bpython.cli import main
     main()
 
 # vim: sw=4 ts=4 sts=4 ai et
diff --git a/bpython/formatter.py b/bpython/formatter.py
@@ -83,16 +83,14 @@ class BPythonFormatter(Formatter):
     See the Pygments source for more info; it's pretty
     straightforward."""
 
-    f_strings = {}
-
     def __init__(self, color_scheme, **options):
-        if not self.f_strings:
-            for k, v in theme_map.iteritems():
-                self.f_strings[k] = '\x01%s' % (color_scheme[v],)
-                if k is Parenthesis:
-                    # FIXME: Find a way to make this the inverse of the current
-                    # background colour
-                    self.f_strings[k] += 'I'
+        self.f_strings = {}
+        for k, v in theme_map.iteritems():
+            self.f_strings[k] = '\x01%s' % (color_scheme[v],)
+            if k is Parenthesis:
+                # FIXME: Find a way to make this the inverse of the current
+                # background colour
+                self.f_strings[k] += 'I'
         Formatter.__init__(self, **options)
 
     def format(self, tokensource, outfile):
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -695,4 +695,5 @@ def main(args=None):
 
 
 if __name__ == '__main__':
+    from bpython.gtk_ import main
     main()
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -75,6 +75,10 @@ def find_modules(path):
             # Possibly a package
             if '.' in name:
                 continue
+        elif os.path.isdir(os.path.join(path, name)):
+            # Unfortunately, CPython just crashes if there is a directory
+            # which ends with a python extension, so work around.
+            continue
         name = os.path.splitext(name)[0]
         try:
             fo, pathname, _ = imp.find_module(name, [path])
@@ -99,6 +103,8 @@ def find_all_modules(path=None):
         path = sys.path
 
     for p in path:
+        if not path:
+            path = os.curdir
         for module in find_modules(p):
             modules.add(module)
             yield
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -22,6 +22,7 @@
 #
 
 from __future__ import with_statement
+import collections
 import inspect
 import pydoc
 import re
@@ -31,6 +32,17 @@
 from pygments.lexers import PythonLexer
 from pygments.token import Token
 
+try:
+    collections.Callable
+    has_collections_callable = True
+    try:
+        import types
+        types.InstanceType
+        has_instance_type = True
+    except AttributeError:
+        has_instance_type = False
+except AttributeError:
+    has_collections_callable = False
 
 py3 = sys.version_info[0] == 3
 
@@ -223,3 +235,13 @@ def is_eval_safe_name(string):
         return all(part.isidentifier() for part in string.split('.'))
     else:
         return all(_name.match(part) for part in string.split('.'))
+
+
+def is_callable(obj):
+    if has_instance_type and isinstance(obj, types.InstanceType):
+        # Work around a Python bug, see issue 7624
+        return callable(obj)
+    elif has_collections_callable:
+        return isinstance(obj, collections.Callable)
+    else:
+        return callable(obj)
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -270,15 +270,13 @@ class Repl(object):
     XXX Subclasses should implement echo, current_line, cw
     """
 
-    def __init__(self, interp, config, idle=None):
-        """Initialise the repl with, unfortunately, a curses screen passed to
-        it.  This needs to be split up so the curses crap isn't in here.
+    def __init__(self, interp, config):
+        """Initialise the repl.
 
         interp is a Python code.InteractiveInterpreter instance
 
-        The optional 'idle' parameter is a function that the repl call while
-        it's blocking (waiting for keypresses). This, again, should be in a
-        different class"""
+        config is a populated bpython.config.Struct.
+        """
 
         self.config = config
         self.cut_buffer = ''
@@ -365,7 +363,7 @@ def attr_lookup(self, obj, expr, attr):
     def _callable_postfix(self, value, word):
         """rlcompleter's _callable_postfix done right."""
         with inspection.AttrCleaner(value):
-            if hasattr(value, '__call__'):
+            if inspection.is_callable(value):
                 word += '('
         return word
 
diff --git a/bpython/urwid.py b/bpython/urwid.py

Original file line number	Diff line number	Diff line change
`@@ -695,4 +695,5 @@ def main(args=None):`
`695`	`695`
`696`	`696`
`697`	`697`	`if __name__ == '__main__':`
	`698`	`+ from bpython.gtk_ import main`
`698`	`699`	`main()`