##// END OF EJS Templates
Backport PR #4043: don't 'restore_bytes' in from_JSON...
Backport PR #4043: don't 'restore_bytes' in from_JSON It makes no sense to turn base64-encoded unicode strings into base64-encoded byte strings. I can't think why we do this, but we should be very careful about testing before merging this fix. fixes the issue tested in #4036.

File last commit:

r7946:6e3a5dfe
r12466:3ff9c5cf
Show More
__init__.py
42 lines | 1.6 KiB | text/x-python | PythonLexer
"""Implementation of all the magic functions built into IPython.
"""
#-----------------------------------------------------------------------------
# Copyright (c) 2012 The IPython Development Team.
#
# Distributed under the terms of the Modified BSD License.
#
# The full license is in the file COPYING.txt, distributed with this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from ..magic import Magics, magics_class
from .auto import AutoMagics
from .basic import BasicMagics
from .code import CodeMagics, MacroToEdit
from .config import ConfigMagics
from .deprecated import DeprecatedMagics
from .display import DisplayMagics
from .execution import ExecutionMagics
from .extension import ExtensionMagics
from .history import HistoryMagics
from .logging import LoggingMagics
from .namespace import NamespaceMagics
from .osm import OSMagics
from .pylab import PylabMagics
from .script import ScriptMagics
#-----------------------------------------------------------------------------
# Magic implementation classes
#-----------------------------------------------------------------------------
@magics_class
class UserMagics(Magics):
"""Placeholder for user-defined magics to be added at runtime.
All magics are eventually merged into a single namespace at runtime, but we
use this class to isolate the magics defined dynamically by the user into
their own class.
"""