/[ascend]/trunk/pygtk/ipython_view.py

Diff of /trunk/pygtk/ipython_view.py

Parent Directory | Revision Log | View Patch Patch

-revision 1923 by jpye,
Sun Mar  9 01:39:10 2008 UTC
+revision 1924 by jpye,
Mon Oct  6 08:21:11 2008 UTC
 Line 1
  #!/usr/bin/python
- """
+ '''
  Provides IPython console widget.
  @author: Eitan Isaacson
 Line 10 
 Provides IPython console widget.
  All rights reserved. This program and the accompanying materials are made
  available under the terms of the BSD which accompanies this distribution, and
  is available at U{http://www.opensource.org/licenses/bsd-license.php}
- """
+ '''
  import gtk, gobject
  import re
 Line 26 
 except Exception,e:
      raise Exception("Error importing IPython (%s)" % str(e))
  class IterableIPShell:
-   """
+   '''
    Create an IPython instance. Does not start a blocking event loop,
    instead allow single iterations. This allows embedding in GTK+
    without blockage.
 Line 41 
 class IterableIPShell:
    @type history_level: integer
    @ivar complete_sep: Seperation delimeters for completion function.
    @type complete_sep: _sre.SRE_Pattern
-   """
+   '''
    def __init__(self,argv=[],user_ns=None,user_global_ns=None,
                 cin=None, cout=None,cerr=None, input_func=None):
-     """
+     '''
      @param argv: Command line options for IPython
      @type argv: list
      @param user_ns: User namespace.
-Line 59 
 class IterableIPShell:
+Line 61 
 class IterableIPShell:
      @type cerr: IO stream
      @param input_func: Replacement for builtin raw_input()
      @type input_func: function
-     """
+     '''
      if input_func:
        IPython.iplib.raw_input_original = input_func
      if cin:
-Line 91 
 class IterableIPShell:
+Line 92 
 class IterableIPShell:
      self.complete_sep =  re.compile('[\s\{\}\[\]\(\)]')
    def execute(self):
-     """
+     '''
      Executes the current line provided by the shell object.
-     """
+     '''
      self.history_level = 0
      orig_stdout = sys.stdout
      sys.stdout = IPython.Shell.Term.cout
-Line 126 
 class IterableIPShell:
+Line 127 
 class IterableIPShell:
      sys.stdout = orig_stdout
    def historyBack(self):
-     """
+     '''
      Provides one history command back.
      @return: The command string.
      @rtype: string
-     """
+     '''
      self.history_level -= 1
      return self._getHistory()
    def historyForward(self):
-     """
+     '''
      Provides one history command forward.
      @return: The command string.
      @rtype: string
-     """
+     '''
      self.history_level += 1
      return self._getHistory()
    def _getHistory(self):
-     """
+     '''
      Get's the command string of the current history level.
      @return: Historic command string.
      @rtype: string
-     """
+     '''
      try:
        rv = self.IP.user_ns['In'][self.history_level].strip('\n')
      except IndexError:
-Line 160 
 class IterableIPShell:
+Line 161 
 class IterableIPShell:
      return rv
    def updateNamespace(self, ns_dict):
-     """
+     '''
      Add the current dictionary to the shell namespace.
      @param ns_dict: A dictionary of symbol-values.
      @type ns_dict: dictionary
-     """
+     '''
      self.IP.user_ns.update(ns_dict)
    def complete(self, line):
-     """
+     '''
      Returns an auto completed line and/or posibilities for completion.
      @param line: Given line so far.
-Line 178 
 class IterableIPShell:
+Line 179 
 class IterableIPShell:
      @return: Line completed as for as possible,
      and possible further completions.
      @rtype: tuple
-     """
+     '''
      split_line = self.complete_sep.split(line)
      possibilities = self.IP.complete(split_line[-1])
      if possibilities:
        def _commonPrefix(str1, str2):
-         """
+         '''
          Reduction function. returns common prefix of two given strings.
          @param str1: First string.
-Line 193 
 class IterableIPShell:
+Line 194 
 class IterableIPShell:
          @return: Common prefix to both strings.
          @rtype: string
-         """
+         '''
          for i in range(len(str1)):
            if not str2.startswith(str1[:i+1]):
              return str1[:i]
-Line 206 
 class IterableIPShell:
+Line 207 
 class IterableIPShell:
    def shell(self, cmd,verbose=0,debug=0,header=''):
-     """
+     '''
      Replacement method to allow shell commands without them blocking.
      @param cmd: Shell command to execute.
-Line 217 
 class IterableIPShell:
+Line 218 
 class IterableIPShell:
      @type debug: integer
      @param header: Header to be printed before output
      @type header: string
-     """
+     '''
      stat = 0
      if verbose or debug: print header+cmd
      # flush stdout so we don't mangle python's buffering
-Line 228 
 class IterableIPShell:
+Line 229 
 class IterableIPShell:
        input.close()
  class ConsoleView(gtk.TextView):
-   """
+   '''
    Specialized text view for console-like workflow.
    @cvar ANSI_COLORS: Mapping of terminal colors to X11 names.
-Line 242 
 class ConsoleView(gtk.TextView):
+Line 243 
 class ConsoleView(gtk.TextView):
    @type mark: gtk.TextMark
    @ivar line_start: Start of command line mark.
    @type line_start: gtk.TextMark
-   """
+   '''
    ANSI_COLORS =  {'0;30': 'Black',     '0;31': 'Red',
                    '0;32': 'Green',     '0;33': 'Brown',
                    '0;34': 'Blue',      '0;35': 'Purple',
-Line 253 
 class ConsoleView(gtk.TextView):
+Line 254 
 class ConsoleView(gtk.TextView):
                    '1;36': 'LightCyan', '1;37': 'White'}
    def __init__(self):
-     """
+     '''
      Initialize console view.
-     """
+     '''
      gtk.TextView.__init__(self)
      self.modify_font(pango.FontDescription('Mono'))
      self.set_cursor_visible(True)
-Line 279 
 class ConsoleView(gtk.TextView):
+Line 280 
 class ConsoleView(gtk.TextView):
      gobject.idle_add(self._write, text, editable)
    def _write(self, text, editable=False):
-     """
+     '''
      Write given text to buffer.
      @param text: Text to append.
      @type text: string
      @param editable: If true, added text is editable.
      @type editable: boolean
-     """
+     '''
      segments = self.color_pat.split(text)
      segment = segments.pop(0)
      start_mark = self.text_buffer.create_mark(None,
-Line 313 
 class ConsoleView(gtk.TextView):
+Line 314 
 class ConsoleView(gtk.TextView):
      gobject.idle_add(self._showPrompt, prompt)
    def _showPrompt(self, prompt):
-     """
+     '''
      Prints prompt at start of line.
      @param prompt: Prompt to print.
      @type prompt: string
-     """
+     '''
      self._write(prompt)
      self.text_buffer.move_mark(self.line_start,
                                 self.text_buffer.get_end_iter())
-Line 327 
 class ConsoleView(gtk.TextView):
+Line 328 
 class ConsoleView(gtk.TextView):
      gobject.idle_add(self._changeLine, text)
    def _changeLine(self, text):
-     """
+     '''
      Replace currently entered command line with given text.
      @param text: Text to use as replacement.
      @type text: string
-     """
+     '''
      iter = self.text_buffer.get_iter_at_mark(self.line_start)
      iter.forward_to_line_end()
      self.text_buffer.delete(self.text_buffer.get_iter_at_mark(self.line_start), iter)
      self._write(text, True)
    def getCurrentLine(self):
-     """
+     '''
      Get text in current command line.
      @return: Text of current command line.
      @rtype: string
-     """
+     '''
      rv = self.text_buffer.get_slice(
        self.text_buffer.get_iter_at_mark(self.line_start),
        self.text_buffer.get_end_iter(), False)
-Line 354 
 class ConsoleView(gtk.TextView):
+Line 355 
 class ConsoleView(gtk.TextView):
      gobject.idle_add(self._showReturned, text)
    def _showReturned(self, text):
-     """
+     '''
      Show returned text from last command and print new prompt.
      @param text: Text to show.
      @type text: string
-     """
+     '''
      iter = self.text_buffer.get_iter_at_mark(self.line_start)
      iter.forward_to_line_end()
      self.text_buffer.apply_tag_by_name(
-Line 374 
 class ConsoleView(gtk.TextView):
+Line 375 
 class ConsoleView(gtk.TextView):
      self.text_buffer.place_cursor(self.text_buffer.get_end_iter())
    def onKeyPress(self, widget, event):
-     """
+     '''
      Key press callback used for correcting behavior for console-like
      interfaces. For example 'home' should go to prompt, not to begining of
      line.
-Line 386 
 class ConsoleView(gtk.TextView):
+Line 387 
 class ConsoleView(gtk.TextView):
      @return: Return True if event should not trickle.
      @rtype: boolean
-     """
+     '''
      insert_mark = self.text_buffer.get_insert()
      insert_iter = self.text_buffer.get_iter_at_mark(insert_mark)
      selection_mark = self.text_buffer.get_selection_bound()
      selection_iter = self.text_buffer.get_iter_at_mark(selection_mark)
      start_iter = self.text_buffer.get_iter_at_mark(self.line_start)
      if event.keyval == gtk.keysyms.Home:
-       if event.state == 0:
+       if event.state & gtk.gdk.CONTROL_MASK or event.state & gtk.gdk.MOD1_MASK:
-         self.text_buffer.place_cursor(start_iter)
+         pass
-         return True
+       elif event.state & gtk.gdk.SHIFT_MASK:
-       elif event.state == gtk.gdk.SHIFT_MASK:
          self.text_buffer.move_mark(insert_mark, start_iter)
          return True
+       else:
+         self.text_buffer.place_cursor(start_iter)
+         return True
      elif event.keyval == gtk.keysyms.Left:
        insert_iter.backward_cursor_position()
        if not insert_iter.editable(True):
-Line 419 
 class ConsoleView(gtk.TextView):
+Line 422 
 class ConsoleView(gtk.TextView):
      return self.onKeyPressExtend(event)
    def onKeyPressExtend(self, event):
-     """
+     '''
      For some reason we can't extend onKeyPress directly (bug #500900).
-     """
+     '''
      pass
  class IPythonView(ConsoleView, IterableIPShell):
-   """
+   '''
    Sub-class of both modified IPython shell and L{ConsoleView} this makes
    a GTK+ IPython console.
-   """
+   '''
    def __init__(self):
-     """
+     '''
      Initialize. Redirect I/O to console.
-     """
+     '''
      ConsoleView.__init__(self)
      self.cout = StringIO()
      IterableIPShell.__init__(self, cout=self.cout,cerr=self.cout,
-Line 444 
 class IPythonView(ConsoleView, IterableI
+Line 447 
 class IPythonView(ConsoleView, IterableI
      self.interrupt = False
    def raw_input(self, prompt=''):
-     """
+     '''
      Custom raw_input() replacement. Get's current line from console buffer.
      @param prompt: Prompt to print. Here for compatability as replacement.
-Line 452 
 class IPythonView(ConsoleView, IterableI
+Line 455 
 class IPythonView(ConsoleView, IterableI
      @return: The current command line text.
      @rtype: string
-     """
+     '''
      if self.interrupt:
        self.interrupt = False
        raise KeyboardInterrupt
      return self.getCurrentLine()
    def onKeyPressExtend(self, event):
-     """
+     '''
      Key press callback with plenty of shell goodness, like history,
      autocompletions, etc.
-Line 470 
 class IPythonView(ConsoleView, IterableI
+Line 473 
 class IPythonView(ConsoleView, IterableI
      @return: True if event should not trickle.
      @rtype: boolean
-     """
+     '''
      if event.state & gtk.gdk.CONTROL_MASK and event.keyval == 99:
        self.interrupt = True
        self._processLine()
-Line 498 
 class IPythonView(ConsoleView, IterableI
+Line 501 
 class IPythonView(ConsoleView, IterableI
        return True
    def _processLine(self):
-     """
+     '''
      Process current command line.
-     """
+     '''
      self.history_pos = 0
      self.execute()
      rv = self.cout.getvalue()
-Line 508 
 class IPythonView(ConsoleView, IterableI
+Line 511 
 class IPythonView(ConsoleView, IterableI
      self.showReturned(rv)
      self.cout.truncate(0)

 Legend:



Removed from v.1923
 


changed lines


 
Added in v.1924
 Legend:



Removed from v.1923
 


changed lines


 
Added in v.1924
-Removed from v.1923
+Added in v.1924

john.pye@anu.edu.au	ViewVC Help
Powered by ViewVC 1.1.22