diff --git a/lib/ipython_view.py b/lib/ipython_view.py --- a/lib/ipython_view.py +++ b/lib/ipython_view.py @@ -15,11 +15,12 @@ is available at U{http://www.opensource. # this file is a modified version of source code from the Accerciser project # http://live.gnome.org/accerciser -import gtk +from gi.repository import Gtk +from gi.repository import Gdk import re import sys import os -import pango +from gi.repository import Pango from StringIO import StringIO try: @@ -155,10 +156,10 @@ class IterableIPShell: output.close() input.close() -class ConsoleView(gtk.TextView): +class ConsoleView(Gtk.TextView): def __init__(self): - gtk.TextView.__init__(self) - self.modify_font(pango.FontDescription('Mono')) + Gtk.TextView.__init__(self) + self.modify_font(Pango.FontDescription('Mono')) self.set_cursor_visible(True) self.text_buffer = self.get_buffer() self.mark = self.text_buffer.create_mark('scroll_mark', @@ -267,21 +268,21 @@ class IPythonView(ConsoleView, IterableI return self.getCurrentLine() def keyPress(self, widget, event): - if event.state & gtk.gdk.CONTROL_MASK and event.keyval == 99: + if event.state & Gdk.ModifierType.CONTROL_MASK and event.keyval == 99: self.interrupt = True self._processLine() return True - elif event.keyval == gtk.keysyms.Return: + elif event.keyval == Gtk.keysyms.Return: self._processLine() return True - elif event.keyval == gtk.keysyms.Up: + elif event.keyval == Gtk.keysyms.Up: self.changeLine(self.historyBack()) return True - elif event.keyval == gtk.keysyms.Down: + elif event.keyval == Gtk.keysyms.Down: self.changeLine(self.historyForward()) return True # todo: Home needs to advance past the ipython prompt - elif event.keyval == gtk.keysyms.Tab: + elif event.keyval == Gtk.keysyms.Tab: if not self.getCurrentLine().strip(): return False completed, possibilities = self.complete(self.getCurrentLine())