upstream/ipython Files · IPython/lib/inputhookgtk.py

Merge pull request from bfroehle/revert_1831...

Merge pull request from bfroehle/revert_1831 Revert , the `__file__` injection in safe_execfile / safe_execfile_ipy. This reverts commit 2717feb, reversing changes made to ea4f608. Pull request (fix set __file__ when running .ipy files) has been the source of a lot of grief: : Setting __file__ to None breaks Mayavi import : Using warnings.warn() results in TypeError In general the patch was inappropriate because it: 1. Fails to properly restore the context, by setting __file__ to None rather than deleting it. 2. Sets __file__ in the wrong dictionary (self.user_ns rather than where[0]).

Matthias BUSSONNIER - - Load All Authors

File last commit:

r5390:c82649ea


                r8509:d3d37a3a

Download file

             inputhookgtk.py
        
                    35 lines
            
             | 1017 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / lib / inputhookgtk.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # encoding: utf-8

      """

      Enable pygtk to be used interacive by setting PyOS_InputHook.

      Authors: Brian Granger

      """

      #-----------------------------------------------------------------------------

      #  Copyright (C) 2008-2011  The IPython Development Team

      #

      #  Distributed under the terms of the BSD License.  The full license is in

      #  the file COPYING, distributed as part of this software.

      #-----------------------------------------------------------------------------

      #-----------------------------------------------------------------------------

      # Imports

      #-----------------------------------------------------------------------------

      import sys

      import gtk, gobject

      #-----------------------------------------------------------------------------

      # Code

      #-----------------------------------------------------------------------------

      def _main_quit(*args, **kwargs):

          gtk.main_quit()

          return False

      def inputhook_gtk():

          gobject.io_add_watch(sys.stdin, gobject.IO_IN, _main_quit)

          gtk.main()

          return 0

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# encoding: utf-8
				"""
				Enable pygtk to be used interacive by setting PyOS_InputHook.

				Authors: Brian Granger
				"""

				#-----------------------------------------------------------------------------
				# Copyright (C) 2008-2011 The IPython Development Team
				#
				# Distributed under the terms of the BSD License. The full license is in
				# the file COPYING, distributed as part of this software.
				#-----------------------------------------------------------------------------

				#-----------------------------------------------------------------------------
				# Imports
				#-----------------------------------------------------------------------------

				import sys
				import gtk, gobject

				#-----------------------------------------------------------------------------
				# Code
				#-----------------------------------------------------------------------------


				def _main_quit(args, *kwargs):
				gtk.main_quit()
				return False

				def inputhook_gtk():
				gobject.io_add_watch(sys.stdin, gobject.IO_IN, _main_quit)
				gtk.main()
				return 0