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

fix base64 code in nbformat.v2...

fix base64 code in nbformat.v2 base64 encoding functions were called, but had no effect, because the notebook already has everything as b64-encoded bytestrings, which are valid ascii literals on Python 2. However, the encode/decode logic is actually triggered on Python 3, revealing its errors. This fixes the base64 functions that had no effect to have their intended effect, but does not use them. Rather, it is assumed that bytes objects are already b64-encoded (and thus ascii-safe), which assumption was already made in Python 2.

Thomas Kluyver - - Load All Authors

File last commit:

r4742:cf41e141


                r5174:66077063

Download file

             macro.py
        
                    59 lines
            
             | 1.9 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / core / macro.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """Support for interactive macros in IPython"""

      #*****************************************************************************

      #       Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu>

      #

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

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

      #*****************************************************************************

      import re

      import sys

      from IPython.utils import py3compat

      coding_declaration = re.compile(r"#\s*coding[:=]\s*([-\w.]+)")

      class Macro(object):

          """Simple class to store the value of macros as strings.

          Macro is just a callable that executes a string of IPython

          input when called.

          Args to macro are available in _margv list if you need them.

          """

          def __init__(self,code):

              """store the macro value, as a single string which can be executed"""

              lines = []

              enc = None

              for line in code.splitlines():

                  coding_match = coding_declaration.match(line)

                  if coding_match:

                      enc = coding_match.group(1)

                  else:

                      lines.append(line)

              code = "\n".join(lines)

              if isinstance(code, bytes):

                  code = code.decode(enc or sys.getdefaultencoding())

              self.value = code + '\n'

          def __str__(self):

              return py3compat.unicode_to_str(self.value)

          def __unicode__(self):

              return self.value

          def __repr__(self):

              return 'IPython.macro.Macro(%s)' % repr(self.value)

          def __getstate__(self):

              """ needed for safe pickling via %store """

              return {'value': self.value}

          def __add__(self, other):

              if isinstance(other, Macro):

                  return Macro(self.value + other.value)

              elif isinstance(other, basestring):

                  return Macro(self.value + other)

              raise TypeError

	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

				"""Support for interactive macros in IPython"""

				#*****************************************************************************
				# Copyright (C) 2001-2005 Fernando Perez <fperez@colorado.edu>
				#
				# Distributed under the terms of the BSD License. The full license is in
				# the file COPYING, distributed as part of this software.
				#*****************************************************************************

				import re
				import sys

				from IPython.utils import py3compat

				coding_declaration = re.compile(r"#\scoding[:=]\s([-\w.]+)")

				class Macro(object):
				"""Simple class to store the value of macros as strings.

				Macro is just a callable that executes a string of IPython
				input when called.

				Args to macro are available in _margv list if you need them.
				"""

				def __init__(self,code):
				"""store the macro value, as a single string which can be executed"""
				lines = []
				enc = None
				for line in code.splitlines():
				coding_match = coding_declaration.match(line)
				if coding_match:
				enc = coding_match.group(1)
				else:
				lines.append(line)
				code = "\n".join(lines)
				if isinstance(code, bytes):
				code = code.decode(enc or sys.getdefaultencoding())
				self.value = code + '\n'

				def __str__(self):
				return py3compat.unicode_to_str(self.value)

				def __unicode__(self):
				return self.value

				def __repr__(self):
				return 'IPython.macro.Macro(%s)' % repr(self.value)

				def __getstate__(self):
				""" needed for safe pickling via %store """
				return {'value': self.value}

				def __add__(self, other):
				if isinstance(other, Macro):
				return Macro(self.value + other.value)
				elif isinstance(other, basestring):
				return Macro(self.value + other)
				raise TypeError