upstream/ipython Files · IPython/terminal/pt_inputhooks/pyglet.py

Release 5.0.0b4...

Release 5.0.0b4 What's new since b3: Small delay since last beta release, sorry about that, a few reasons though: - We / I slowed down a bit on the beta release pace, there was a few bugs/issues/User interface annoyance that needed a new version of prompt_toolkit to be released, there was no reasons to make extra-beta without this new version released. - We backed-down on some changes on which we had a few disagrements (more below). - I got sick, and had to catch up with backlog. Anyway, Jonathan release prompt_toolkit 1.0.1 and 1.0.2, so even if you don't try this new beta, upgrading prompt_toolkit will fix some of your issues. == Move back `TerminalInteractiveShell` to it's old place. This is a bigger breaking change since 5.0b3, the `TerminalInteractiveshell` moved back from `IPython.terminal.ptshell` to `IPython.terminal.interactiveshell`, if you've updated your project recently to adapt to this change we're sorry, but despite the fact that the version pre 5.0 and post 5.0 are relatively different the cost of conditional import for project depending on us appeared to be too high. So it's now easier to migrate from 4.0 to 5.0 as the class have the same name, and same location == Option name and default changed. `TerminalInteractiveShell.display_completions_in_column` is now gone. It was not present on 4.x so no API breakage there, and is now replaced by `TerminalInteractiveShell.display_completions` and is a enum that gained a 3rd mode for the completer: `readlinelike` for those of you that regret readline. This give us more flexibility for further options. Would appreciate testing of this new layout from vi user. The two other mode now being `column` and `multicolumn`. By popular request, `multicolumn` is not the default value for the previous option. == bug fixed: - quit/exit broken in ipdb - Copy/Past broken on windowm - Unicode broken on windows - function signature garbled when using `object?` - issue with paging text with `?` - completer could get stuck. See the complete git log for more informations.

Thomas Kluyver - - Load All Authors

File last commit:

r21942:1f47f59a


                r22560:1b487f7a

Download file

             pyglet.py
        
                    68 lines
            
             | 2.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / terminal / pt_inputhooks / pyglet.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """Enable pyglet to be used interacively with prompt_toolkit

      """

      from __future__ import absolute_import

      import os

      import sys

      import time

      from timeit import default_timer as clock

      import pyglet

      # On linux only, window.flip() has a bug that causes an AttributeError on

      # window close.  For details, see:

      # http://groups.google.com/group/pyglet-users/browse_thread/thread/47c1aab9aa4a3d23/c22f9e819826799e?#c22f9e819826799e

      if sys.platform.startswith('linux'):

          def flip(window):

              try:

                  window.flip()

              except AttributeError:

                  pass

      else:

          def flip(window):

              window.flip()

      def inputhook(context):

          """Run the pyglet event loop by processing pending events only.

          This keeps processing pending events until stdin is ready.  After

          processing all pending events, a call to time.sleep is inserted.  This is

          needed, otherwise, CPU usage is at 100%.  This sleep time should be tuned

          though for best performance.

          """

          # We need to protect against a user pressing Control-C when IPython is

          # idle and this is running. We trap KeyboardInterrupt and pass.

          try:

              t = clock()

              while not context.input_is_ready():

                  pyglet.clock.tick()

                  for window in pyglet.app.windows:

                      window.switch_to()

                      window.dispatch_events()

                      window.dispatch_event('on_draw')

                      flip(window)

                  # We need to sleep at this point to keep the idle CPU load

                  # low.  However, if sleep to long, GUI response is poor.  As

                  # a compromise, we watch how often GUI events are being processed

                  # and switch between a short and long sleep time.  Here are some

                  # stats useful in helping to tune this.

                  # time    CPU load

                  # 0.001   13%

                  # 0.005   3%

                  # 0.01    1.5%

                  # 0.05    0.5%

                  used_time = clock() - t

                  if used_time > 10.0:

                      # print 'Sleep for 1 s'  # dbg

                      time.sleep(1.0)

                  elif used_time > 0.1:

                      # Few GUI events coming in, so we can sleep longer

                      # print 'Sleep for 0.05 s'  # dbg

                      time.sleep(0.05)

                  else:

                      # Many GUI events coming in, so sleep only very little

                      time.sleep(0.001)

          except KeyboardInterrupt:

              pass

	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

				"""Enable pyglet to be used interacively with prompt_toolkit
				"""
				from __future__ import absolute_import

				import os
				import sys
				import time
				from timeit import default_timer as clock
				import pyglet

				# On linux only, window.flip() has a bug that causes an AttributeError on
				# window close. For details, see:
				# http://groups.google.com/group/pyglet-users/browse_thread/thread/47c1aab9aa4a3d23/c22f9e819826799e?#c22f9e819826799e

				if sys.platform.startswith('linux'):
				def flip(window):
				try:
				window.flip()
				except AttributeError:
				pass
				else:
				def flip(window):
				window.flip()


				def inputhook(context):
				"""Run the pyglet event loop by processing pending events only.

				This keeps processing pending events until stdin is ready. After
				processing all pending events, a call to time.sleep is inserted. This is
				needed, otherwise, CPU usage is at 100%. This sleep time should be tuned
				though for best performance.
				"""
				# We need to protect against a user pressing Control-C when IPython is
				# idle and this is running. We trap KeyboardInterrupt and pass.
				try:
				t = clock()
				while not context.input_is_ready():
				pyglet.clock.tick()
				for window in pyglet.app.windows:
				window.switch_to()
				window.dispatch_events()
				window.dispatch_event('on_draw')
				flip(window)

				# We need to sleep at this point to keep the idle CPU load
				# low. However, if sleep to long, GUI response is poor. As
				# a compromise, we watch how often GUI events are being processed
				# and switch between a short and long sleep time. Here are some
				# stats useful in helping to tune this.
				# time CPU load
				# 0.001 13%
				# 0.005 3%
				# 0.01 1.5%
				# 0.05 0.5%
				used_time = clock() - t
				if used_time > 10.0:
				# print 'Sleep for 1 s' # dbg
				time.sleep(1.0)
				elif used_time > 0.1:
				# Few GUI events coming in, so we can sleep longer
				# print 'Sleep for 0.05 s' # dbg
				time.sleep(0.05)
				else:
				# Many GUI events coming in, so sleep only very little
				time.sleep(0.001)
				except KeyboardInterrupt:
				pass