upstream/ipython Files · IPython/kernel/zmq/__init__.py

Merge pull request from minrk/qt_hist_up...

Merge pull request from minrk/qt_hist_up tweak history prefix search (up/^p) in qtconsole moving the cursor around the line could result in weird inconsistencies in the prefix. This simplifies the logic by always using the cursor position to set the history prefix, and better determine when the history prefix has actually changed. also fixes a small typo where a while-loop was always checking the initial value, rather than the iterator, which could result in an IndexError at the end of the history. closes

MinRK - - Load All Authors

File last commit:

r9372:37f32253


                r9460:eab14951

Download file

             __init__.py
        
                    49 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / kernel / zmq / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      #  Copyright (C) 2010  The IPython Development Team

      #

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

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

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

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

      # Verify zmq version dependency >= 2.1.11

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

      import warnings

      from IPython.utils.version import check_version

      def patch_pyzmq():

          """backport a few patches from newer pyzmq

          These can be removed as we bump our minimum pyzmq version

          """

          import zmq

          # fallback on stdlib json if jsonlib is selected, because jsonlib breaks things.

          # jsonlib support is removed from pyzmq >= 2.2.0

          from zmq.utils import jsonapi

          if jsonapi.jsonmod.__name__ == 'jsonlib':

              import json

              jsonapi.jsonmod = json

      def check_for_zmq(minimum_version, module='IPython.kernel.zmq'):

          try:

              import zmq

          except ImportError:

              raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))

          pyzmq_version = zmq.__version__

          if not check_version(pyzmq_version, minimum_version):

              raise ImportError("%s requires pyzmq >= %s, but you have %s"%(

                              module, minimum_version, pyzmq_version))

      check_for_zmq('2.1.11')

      patch_pyzmq()

      from .session import Session

	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

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

				#-----------------------------------------------------------------------------
				# Verify zmq version dependency >= 2.1.11
				#-----------------------------------------------------------------------------

				import warnings
				from IPython.utils.version import check_version


				def patch_pyzmq():
				"""backport a few patches from newer pyzmq

				These can be removed as we bump our minimum pyzmq version
				"""

				import zmq

				# fallback on stdlib json if jsonlib is selected, because jsonlib breaks things.
				# jsonlib support is removed from pyzmq >= 2.2.0

				from zmq.utils import jsonapi
				if jsonapi.jsonmod.__name__ == 'jsonlib':
				import json
				jsonapi.jsonmod = json


				def check_for_zmq(minimum_version, module='IPython.kernel.zmq'):
				try:
				import zmq
				except ImportError:
				raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))

				pyzmq_version = zmq.__version__

				if not check_version(pyzmq_version, minimum_version):
				raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
				module, minimum_version, pyzmq_version))

				check_for_zmq('2.1.11')
				patch_pyzmq()

				from .session import Session