upstream/ipython Files · IPython/deathrow/numeric_formats.py

Limit special-casing of _ variable to doctests....

Limit special-casing of _ variable to doctests. In doctests, _ *must* be special-cased and removed from the user's namespace because otherwise Python won't set it. But we were doing this special-casing unconditionally, making it impossible to write unittests that checked the _ variable after cell execution. This commit makes the special-casing of _ apply only in the doctest execution (where it's needed) and leaves normal unittests alone.

Brian Granger - - Load All Authors

File last commit:

r2267:928c921b


                r3299:827b2686

Download file

             numeric_formats.py
        
                    43 lines
            
             | 1.2 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / deathrow / numeric_formats.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

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

      """

      Extension for printing Numeric Arrays in flexible ways.

      """

      from Numeric import ArrayType

      def num_display(self,arg):

          """Display method for printing which treats Numeric arrays specially.

          """

          # Non-numpy variables are printed using the system default

          if type(arg) != ArrayType:

              self._display(arg)

              return

          # Otherwise, we do work.

          format = __IPYTHON__.runtime_rc.numarray_print_format

          print 'NumPy array, format:',format

          # Here is where all the printing logic needs to be implemented

          print arg # nothing yet :)

      def magic_format(self,parameter_s=''):

          """Specifies format of numerical output.

          This command is similar to Ocave's format command.

          """

          valid_formats = ['long','short']

          if parameter_s in valid_formats:

              self.runtime_rc.numarray_print_format = parameter_s

              print 'Numeric output format is now:',parameter_s

          else:

              print 'Invalid format:',parameter_s

              print 'Valid formats:',valid_formats

      # setup default format

      __IPYTHON__.runtime_rc.numarray_print_format = 'long'

      # Bind our new functions to the interpreter

      __IPYTHON__.__class__.magic_format = magic_format

      __IPYTHON__.hooks.display = num_display

	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 --
				"""
				Extension for printing Numeric Arrays in flexible ways.
				"""

				from Numeric import ArrayType

				def num_display(self,arg):
				"""Display method for printing which treats Numeric arrays specially.
				"""

				# Non-numpy variables are printed using the system default
				if type(arg) != ArrayType:
				self._display(arg)
				return
				# Otherwise, we do work.
				format = __IPYTHON__.runtime_rc.numarray_print_format
				print 'NumPy array, format:',format
				# Here is where all the printing logic needs to be implemented
				print arg # nothing yet :)


				def magic_format(self,parameter_s=''):
				"""Specifies format of numerical output.

				This command is similar to Ocave's format command.
				"""

				valid_formats = ['long','short']

				if parameter_s in valid_formats:
				self.runtime_rc.numarray_print_format = parameter_s
				print 'Numeric output format is now:',parameter_s
				else:
				print 'Invalid format:',parameter_s
				print 'Valid formats:',valid_formats

				# setup default format
				__IPYTHON__.runtime_rc.numarray_print_format = 'long'

				# Bind our new functions to the interpreter
				__IPYTHON__.__class__.magic_format = magic_format
				__IPYTHON__.hooks.display = num_display