Merge in main branch with wizard branch to keep up to date

ikanobori · ikanobori · commit 047d8315095f · 2010-01-12T17:54:42.000+01:00
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,20 @@
 Changelog
 =========
 
+v0.9.6.2
+--------
+Unfortunately another bugfix release as I (Bob) broke py3 support.
+
+* #84: bpython doesn't work with Python 3
+       Thanks very much to Henry Prêcheur for both the bug report and the
+       patch.
+
+v0.9.6.1
+--------
+A quick bugfix release (this should not become a habit).
+
+* #82: Crash on saving file.
+
 v0.9.6
 ------
 A bugfix/feature release (and a start at gtk). Happy Christmas everyone!
@@ -13,7 +27,7 @@ A bugfix/feature release (and a start at gtk). Happy Christmas everyone!
 * #78: Theme without a certain value raises exception
 
 - add the possibility for a banner to be shown on bpython startup (when
-  embedded or in code) written by Caio Ramao.
+  embedded or in code) written by Caio Romao.
 - add a hack to add a write() method to our fake stdin object
 - Don't use curses interface when stdout is not attached to a terminal. 
 - PEP-8 conformance.
diff --git a/CHECKLIST b/CHECKLIST
@@ -0,0 +1,33 @@
+Check that all of the following work before a release:
+
+* Runs under Python 2.5, 2.6 and 3.1 (after 2to3).
+
+* Save
+
+* Rewind
+
+* Pastebin
+
+* Pager
+
+* Inspect source
+
+* History
+
+* Tab completion
+
+* Argument inspection
+
+* All keybinds
+
+* All packaged themes
+
+* Command line arguments correctly passed to scripts
+
+* Delegate to standard Python appropriately
+
+* GTK port (and, when implemented, all of the above for GTK port)
+
+* Update CHANGELOG
+
+* Update __version__
diff --git a/ROADMAP b/ROADMAP
@@ -19,3 +19,6 @@ bpython.gtk_
 - Add shortcut keys to bpython.gtk_ 
 - Show a status bar thingy in bpython.gtk_
 - Colourise docstring (#80)
+
+common
+- test suite
diff --git a/bpython/__init__.py b/bpython/__init__.py
@@ -21,7 +21,7 @@
 # THE SOFTWARE.
 
 
-__version__ = '0.9.6'
+__version__ = '0.9.6.2'
 
 
 def embed(locals_=None, args=['-i', '-q'], banner=None):
diff --git a/bpython/args.py b/bpython/args.py
@@ -1,7 +1,6 @@
 """
 Module to handle command line argument parsing, for all front-ends.
 """
-from __future__ import with_statement
 
 from __future__ import with_statement
 import os
@@ -75,7 +74,7 @@ def parse(args, extras=None):
     if options.version:
         print 'bpython version', __version__,
         print 'on top of Python', sys.version.split()[0]
-        print ('(C) 2008-2009 Bob Farrell, Andreas Stuehrk et al. '
+        print ('(C) 2008-2010 Bob Farrell, Andreas Stuehrk et al. '
                'See AUTHORS for detail.')
         raise SystemExit
 
@@ -102,5 +101,6 @@ def exec_code(interpreter, args):
     with open(args[0], 'r') as sourcefile:
         code_obj = compile(sourcefile.read(), args[0], 'exec')
     old_argv, sys.argv = sys.argv, args
+    sys.path.insert(0, os.path.abspath(os.path.dirname(args[0])))
     interpreter.runcode(code_obj)
     sys.argv = old_argv
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -725,7 +725,12 @@ def p_key(self, key):
             self.complete()
             return ''
 
-        elif key == 'KEY_DC':  # Del
+        elif key in key_dispatch[config.delete_key] and not self.s:
+            # Delete on empty line exits
+            self.do_exit = True
+            return None
+
+        elif key in ('KEY_DC', ) + key_dispatch[config.delete_key]:
             self.delete()
             self.complete()
             # Redraw (as there might have been highlighted parens)
@@ -746,12 +751,12 @@ def p_key(self, key):
             self.fwd()
             return ''
 
-        elif key == 'KEY_LEFT':  # Cursor Left
+        elif key in ("KEY_LEFT",' ^B', chr(2)):  # Cursor Left or ^B
             self.mvc(1)
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
 
-        elif key == 'KEY_RIGHT':  # Cursor Right
+        elif key in ("KEY_RIGHT", '^F', chr(6)):  # Cursor Right or ^F
             self.mvc(-1)
             # Redraw (as there might have been highlighted parens)
             self.print_line(self.s)
@@ -896,9 +901,13 @@ def prompt(self, more):
 
     def push(self, s, insert_into_history=True):
         # curses.raw(True) prevents C-c from causing a SIGINT
-        curses.raw(True)
+        curses.raw(False)
         try:
             return Repl.push(self, s, insert_into_history)
+        except SystemExit:
+            # Avoid a traceback on e.g. quit()
+            self.do_exit = True
+            return False
         finally:
             curses.raw(True)
 
@@ -1242,11 +1251,13 @@ class Statusbar(object):
 
     """
 
-    def __init__(self, scr, pwin, background, s=None, c=None):
+    def __init__(self, scr, pwin, background, config, s=None, c=None):
         """Initialise the statusbar and display the initial text (if any)"""
         self.size()
         self.win = newwin(background, self.h, self.w, self.y, self.x)
 
+        self.config = config
+
         self.s = s or ''
         self._s = self.s
         self.c = c
@@ -1385,7 +1396,7 @@ def init_wins(scr, colors, config):
 #
 # This should show to be configured keys from ~/.bpython/config
 #
-    statusbar = Statusbar(scr, main_win, background,
+    statusbar = Statusbar(scr, main_win, background, config,
         " <%s> Rewind  <%s> Save  <%s> Pastebin  <%s> Pager <%s> Show Source " %
             (config.undo_key, config.save_key,
              config.pastebin_key, config.last_output_key,
@@ -1549,13 +1560,14 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     sys.stdout = repl
     sys.stderr = repl
 
-    repl.startup()
-
     if args:
         bpython.args.exec_code(interpreter, args)
         if not interactive:
             curses.raw(False)
             return repl.getstdout()
+    else:
+        sys.path.insert(0, '')
+        repl.startup()
 
     if banner is not None:
         repl.write(banner)
diff --git a/bpython/config.py b/bpython/config.py
@@ -53,8 +53,9 @@ def loadini(struct, configfile):
             'clear_screen': 'C-l',
             'clear_word': 'C-w',
             'cut_to_buffer': 'C-k',
+            'delete': 'C-d',
             'down_one_line': 'C-n',
-            'exit': 'C-d',
+            'exit': '',
             'last_output': 'F9',
             'pastebin': 'F8',
             'save': 'C-s',
@@ -87,6 +88,7 @@ def loadini(struct, configfile):
     struct.clear_word_key = config.get('keyboard', 'clear_word')
     struct.clear_line_key = config.get('keyboard', 'clear_line')
     struct.clear_screen_key = config.get('keyboard', 'clear_screen')
+    struct.delete_key = config.get('keyboard', 'delete')
     struct.exit_key = config.get('keyboard', 'exit')
     struct.last_output_key = config.get('keyboard', 'last_output')
 
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009 the bpython authors.
+# Copyright (c) 2009-2010 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -251,7 +251,8 @@ class ReplWidget(gtk.TextView, repl.Repl):
     __gsignals__ = dict(button_press_event=None,
                         focus_in_event=None,
                         focus_out_event=None,
-                        realize=None)
+                        realize=None,
+                        exit_event=(gobject.SIGNAL_RUN_LAST, None, ()))
 
     def __init__(self, interpreter, config):
         gtk.TextView.__init__(self)
@@ -445,6 +446,10 @@ def do_key_press_event(self, event):
                 self.list_win_visible):
                 self.list_win.back()
                 return True
+        elif state & gtk.gdk.CONTROL_MASK:
+            if event.string == chr(4) and not self.current_line():
+                self.emit('exit-event')
+                return True
         return gtk.TextView.do_key_press_event(self, event)
 
     def do_realize(self):
@@ -575,7 +580,11 @@ def push_line(self):
             self.text_buffer.insert(iter_, '\n')
         self.move_cursor(1)
         self.highlight_current_line()
-        return self.push(line + '\n')
+        try:
+            return self.push(line + '\n')
+        except SystemExit:
+            self.emit('exit-event')
+            return False
 
     def reprint_line(self, lineno, tokens):
         """
@@ -632,16 +641,24 @@ def main(args=None):
 
     interpreter = repl.Interpreter(None, getpreferredencoding())
     repl_widget = ReplWidget(interpreter, config)
+    repl_widget.connect('exit-event', gtk.main_quit)
 
-    sys.stderr = repl_widget
-    sys.stdout = repl_widget
+    gobject.idle_add(init_import_completion)
 
-#    repl.startup()
+    if not exec_args:
+        sys.path.insert(0, '')
+        gobject.idle_add(repl_widget.startup)
+    else:
+        if options.interactive:
+            gobject.idle_add(bpython.args.exec_code, interpreter, exec_args)
+        else:
+            bpython.args.exec_code(interpreter, exec_args)
+            return 0
 
-    gobject.idle_add(init_import_completion)
+    sys.stderr = repl_widget
+    sys.stdout = repl_widget
 
     if not options.socket_id:
-        # print options.socket_id
         parent = gtk.Window()
         parent.connect('delete-event', lambda widget, event: gtk.main_quit())
 
@@ -666,7 +683,15 @@ def main(args=None):
     parent.show_all()
     parent.connect('delete-event', lambda widget, event: gtk.main_quit())
 
-    gtk.main()
+    try:
+        gtk.main()
+    except KeyboardInterrupt:
+        pass
+    finally:
+        if config.hist_length:
+            histfilename = os.path.expanduser(config.hist_file)
+            repl_widget.rl_history.save(histfilename, getpreferredencoding())
+    return 0
 
 
 if __name__ == '__main__':
diff --git a/bpython/importcompletion.py b/bpython/importcompletion.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009 Andreas Stuehrk
+# Copyright (c) 2009-2010 Andreas Stuehrk
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009 the bpython authors.
+# Copyright (c) 2009-2010 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/keys.py b/bpython/keys.py
@@ -32,7 +32,10 @@ def __init__(self):
         self.map = {}
 
     def __getitem__(self, key):
-        if key in self.map:
+        if not key:
+            # Unbound key
+            return str()
+        elif key in self.map:
             return self.map[key]
         else:
             raise Exception('Configured keymap (%s)\
diff --git a/bpython/pager.py b/bpython/pager.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009 Andreas Stuehrk
+# Copyright (c) 2009-2010 Andreas Stuehrk
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -1,6 +1,6 @@
 # The MIT License
 #
-# Copyright (c) 2009 the bpython authors.
+# Copyright (c) 2009-2010 the bpython authors.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -296,7 +296,6 @@ def __init__(self, interp, config, idle=None):
         self.list_win_visible = False
         self._C = {}
         self.prev_block_finished = 0
-        sys.path.insert(0, '.')
 
         pythonhist = os.path.expanduser(self.config.hist_file)
         if os.path.exists(pythonhist):
@@ -310,7 +309,10 @@ def startup(self):
         filename = os.environ.get('PYTHONSTARTUP')
         if filename and os.path.isfile(filename):
             with open(filename, 'r') as f:
-                self.interp.runsource(f.read(), filename, 'exec', encode=False)
+                if py3:
+                    self.interp.runsource(f.read(), filename, 'exec')
+                else:
+                    self.interp.runsource(f.read(), filename, 'exec', encode=False)
 
     def attr_matches(self, text):
         """Taken from rlcompleter.py and bent to my will."""
@@ -648,12 +650,7 @@ def push(self, s, insert_into_history=True):
         if insert_into_history:
             self.rl_history.append(s)
 
-        try:
-            more = self.interp.runsource('\n'.join(self.buffer))
-        except SystemExit:
-            # Avoid a traceback on e.g. quit()
-            self.do_exit = True
-            return False
+        more = self.interp.runsource('\n'.join(self.buffer))
 
         if not more:
             self.buffer = []
diff --git a/doc/bpython.1 b/doc/bpython.1
@@ -70,6 +70,7 @@ Show the help message and exit.
 .IP "\fB\-\-interactive\fR" 4
 .PD
 Drop to bpython shell after running \fIfile\fR instead of exiting.
+The PYTHONSTARTUP file is not read.
 .IP "\fB\-q\fR" 4
 .PD 0
 .IP "\fB\-\-quiet\fR" 4

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# The MIT License`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2009 Andreas Stuehrk`
	`3`	`+# Copyright (c) 2009-2010 Andreas Stuehrk`
`4`	`4`	`#`
`5`	`5`	`# Permission is hereby granted, free of charge, to any person obtaining a copy`
`6`	`6`	`# of this software and associated documentation files (the "Software"), to deal`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# The MIT License`
`2`	`2`	`#`
`3`		`-# Copyright (c) 2009 the bpython authors.`
	`3`	`+# Copyright (c) 2009-2010 the bpython authors.`
`4`	`4`	`#`
`5`	`5`	`# Permission is hereby granted, free of charge, to any person obtaining a copy`
`6`	`6`	`# of this software and associated documentation files (the "Software"), to deal`