Merge in main branch

ikanobori · ikanobori · commit 0c4914b75aa2 · 2010-04-06T22:51:59.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -1659,8 +1659,8 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     clirepl._C = cols
 
     sys.stdin = FakeStdin(repl)
-    sys.stdout = repl
-    sys.stderr = repl
+    sys.stdout = clirepl
+    sys.stderr = clirepl
 
     if args:
         bpython.args.exec_code(interpreter, args)
@@ -1689,7 +1689,7 @@ def main_curses(scr, args, config, interactive=True, locals_=None,
     signal.signal(signal.SIGWINCH, old_sigwinch_handler)
     signal.signal(signal.SIGCONT, old_sigcont_handler)
 
-    return repl.getstdout()
+    return clirepl.getstdout()
 
 
 def main(args=None, locals_=None, banner=None):
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -143,7 +143,15 @@ def __init__(self):
         self.context_id = self.get_context_id('Statusbar')
 
     def message(self, s, n=3):
+        self.clear()
         self.push(self.context_id, s)
+        gobject.timeout_add(n*1000, self.clear)
+
+    def clear(self):
+        self.pop(self.context_id)
+
+        # To stop the timeout from firing again
+        return False
 
 
 class SuggestionWindow(gtk.Window):
@@ -280,6 +288,7 @@ def file_prompt(self, s):
                                         buttons=(gtk.STOCK_CANCEL,gtk.RESPONSE_CANCEL,gtk.STOCK_OPEN,gtk.RESPONSE_OK))
         chooser.set_default_response(gtk.RESPONSE_OK)
         chooser.set_current_name('test.py')
+        chooser.set_current_folder(os.path.expanduser('~'))
         
         pyfilter = gtk.FileFilter()
         pyfilter.set_name("Python files")
@@ -303,7 +312,6 @@ def file_prompt(self, s):
 
     def notify(self, s, n=10):
         self.statusbar.message(s)
-        
 
 class ReplWidget(gtk.TextView, repl.Repl):
     __gsignals__ = dict(button_press_event=None,
@@ -613,7 +621,10 @@ def on_suggestion_selection_changed(self, selection, word):
 
    
     def do_paste(self, widget):
-        self.pastebin()
+        clipboard = gtk.clipboard_get()
+        paste_url = self.pastebin()
+        clipboard.set_text(paste_url)
+        clipboard.store()
 
     def do_write2file(self, widget):
         self.write2file()
diff --git a/bpython/repl.py b/bpython/repl.py
@@ -671,7 +671,7 @@ def pastebin(self, s=None):
         if s == self.prev_pastebin_content:
             self.interact.notify('Duplicate pastebin. Previous URL: ' +
                                   self.prev_pastebin_url)
-            return
+            return self.prev_pastebin_url
 
         self.prev_pastebin_content = s
 
@@ -687,6 +687,7 @@ def pastebin(self, s=None):
         paste_url = paste_url_template.safe_substitute(paste_id=paste_id)
         self.prev_pastebin_url = paste_url
         self.interact.notify('Pastebin URL: %s' % (paste_url, ), 10)
+        return paste_url
 
     def push(self, s, insert_into_history=True):
         """Push a line of code onto the buffer so it can process it all
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -169,7 +169,7 @@ def decoding_input_filter(keys, raw):
     encoding = locale.getpreferredencoding()
     converted_keys = list()
     for key in keys:
-        if isinstance(keys, basestring):
+        if isinstance(key, basestring):
             converted_keys.append(key.decode(encoding))
         else:
             converted_keys.append(key)
