upstream/ipython Files · IPython/core/payload.py

Merge pull request from minrk/websocket...

Merge pull request from minrk/websocket Websocket fixes: 1. alert client on failed and lost web socket connections A long message is given if the connection fails within 1s, which assumes the connection did not succeed. Otherwise, it is a short 'connection closed unexpectedly'. This also means that clients are notified on server termination (for better or worse). 2. remove superfluous ws-hostname parameter from notebook This made the notebook server artificially and unnecessarily brittle against tunneling and explicit hostname resolution. Now, the ws_url is defined based on the Origin of the request for the url, so it always matches the http[s] url. This means that it will follow the same tunnel, and the hostname will be already resolved. Resolving the hostname twice makes no sense at all unless the websockets are going to a different server than the http requests. Implemented as a property, so it should still be easy to change for future cases where it might behave differently (e.g. websockets on a different host, or at a non-root url).

Brian Granger - - Load All Authors

File last commit:

r2814:6e6dcc90


                r5301:f6b3d8ff

Download file

             payload.py
        
                    41 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / core / payload.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # -*- coding: utf-8 -*-

      """Payload system for IPython.

      Authors:

      * Fernando Perez

      * Brian Granger

      """

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

      #       Copyright (C) 2008-2010 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

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

      from IPython.config.configurable import Configurable

      from IPython.utils.traitlets import List

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

      # Main payload class

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

      class PayloadManager(Configurable):

          _payload = List([])

          def write_payload(self, data):

              if not isinstance(data, dict):

                  raise TypeError('Each payload write must be a dict, got: %r' % data)

              self._payload.append(data)

          def read_payload(self):

              return self._payload

          def clear_payload(self):

              self._payload = []

	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

				# -- coding: utf-8 --
				"""Payload system for IPython.

				Authors:

				* Fernando Perez
				* Brian Granger
				"""

				#-----------------------------------------------------------------------------
				# Copyright (C) 2008-2010 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
				#-----------------------------------------------------------------------------

				from IPython.config.configurable import Configurable
				from IPython.utils.traitlets import List

				#-----------------------------------------------------------------------------
				# Main payload class
				#-----------------------------------------------------------------------------

				class PayloadManager(Configurable):

				_payload = List([])

				def write_payload(self, data):
				if not isinstance(data, dict):
				raise TypeError('Each payload write must be a dict, got: %r' % data)
				self._payload.append(data)

				def read_payload(self):
				return self._payload

				def clear_payload(self):
				self._payload = []