##// END OF EJS Templates
refactor to improve cell switching in edit mode...
refactor to improve cell switching in edit mode This code was repeated in both CodeCell and TextCell, both of which are extensions of Cell, so this just unifies the logic in Cell. TextCell had logic here to check if the cell was rendered or not, but I don't believe it is possible to end up triggering such a code path. (Should that be required, I can always just add back these methods to TextCell, performing the .rendered==True check, and calling the Cell prior to this, code mirror at_top would only return true on if the cursor was at the first character of the top line. Now, pressing up arrow on any character on the top line will take you to the cell above. The same applies for the bottom line. Pressing down arrow would only go to the next cell if the cursor was at a location *after* the last character (something that is only possible to achieve in vim mode if the last line is empty, for example). Now, down arrow on any character of the last line will go to the next cell.

File last commit:

r15588:ba5c31bf
r15754:d60e793e
Show More
jsonutil.py
263 lines | 8.3 KiB | text/x-python | PythonLexer
Fernando Perez
Created JSON-safety utilities....
r2947 """Utilities to manipulate JSON objects.
"""
#-----------------------------------------------------------------------------
Matthias BUSSONNIER
update copyright to 2011/20xx-2011...
r5390 # Copyright (C) 2010-2011 The IPython Development Team
Fernando Perez
Created JSON-safety utilities....
r2947 #
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING.txt, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
# stdlib
MinRK
use math to check for nan/inf
r8022 import math
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 import re
Fernando Perez
Created JSON-safety utilities....
r2947 import types
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 from datetime import datetime
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041 try:
# base64.encodestring is deprecated in Python 3.x
from base64 import encodebytes
except ImportError:
# Python 2.x
from base64 import encodestring as encodebytes
Thomas Kluyver
Various Python 3 fixes in IPython.utils
r4764 from IPython.utils import py3compat
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 from IPython.utils.py3compat import string_types, unicode_type, iteritems
Brandon Parsons
saner default encoding mechanism
r6716 from IPython.utils.encoding import DEFAULT_ENCODING
Thomas Kluyver
Various Python 3 fixes in IPython.utils
r4764 next_attr_name = '__next__' if py3compat.PY3 else 'next'
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 #-----------------------------------------------------------------------------
# Globals and constants
#-----------------------------------------------------------------------------
# timestamp formats
MinRK
fix ISO8601 re...
r13511 ISO8601 = "%Y-%m-%dT%H:%M:%S.%f"
MinRK
allow datestamps to exclude microseconds...
r15308 ISO8601_PAT=re.compile(r"^(\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2})(\.\d{1,6})?Z?([\+\-]\d{2}:?\d{2})?$")
Fernando Perez
Created JSON-safety utilities....
r2947
MinRK
make one strptime call at import of jsonutil...
r15588 # holy crap, strptime is not threadsafe.
# Calling it once at import seems to help.
datetime.strptime("1", "%d")
Fernando Perez
Created JSON-safety utilities....
r2947 #-----------------------------------------------------------------------------
# Classes and functions
#-----------------------------------------------------------------------------
MinRK
move rekey to jsonutil from parallel.util...
r4036 def rekey(dikt):
"""Rekey a dict that has been forced to use str keys where there should be
ints by json."""
Thomas Kluyver
Remove uses of iterkeys
r13360 for k in dikt:
Thomas Kluyver
Replace references to unicode and basestring
r13353 if isinstance(k, string_types):
MinRK
move rekey to jsonutil from parallel.util...
r4036 ik=fk=None
try:
ik = int(k)
except ValueError:
try:
fk = float(k)
except ValueError:
continue
if ik is not None:
nk = ik
else:
nk = fk
if nk in dikt:
raise KeyError("already have key %r"%nk)
dikt[nk] = dikt.pop(k)
return dikt
MinRK
separate single-date parsing from walking extraction...
r13520 def parse_date(s):
"""parse an ISO8601 date string
If it is None or not a valid ISO8601 timestamp,
it will be returned unmodified.
Otherwise, it will return a datetime object.
"""
if s is None:
return s
m = ISO8601_PAT.match(s)
if m:
# FIXME: add actual timezone support
# this just drops the timezone info
MinRK
allow datestamps to exclude microseconds...
r15308 notz, ms, tz = m.groups()
if not ms:
ms = '.0'
notz = notz + ms
MinRK
separate single-date parsing from walking extraction...
r13520 return datetime.strptime(notz, ISO8601)
return s
MinRK
move rekey to jsonutil from parallel.util...
r4036
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 def extract_dates(obj):
"""extract ISO8601 dates from unpacked JSON"""
if isinstance(obj, dict):
MinRK
separate single-date parsing from walking extraction...
r13520 new_obj = {} # don't clobber
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k,v in iteritems(obj):
MinRK
separate single-date parsing from walking extraction...
r13520 new_obj[k] = extract_dates(v)
obj = new_obj
MinRK
handle datetime objects in Session...
r4008 elif isinstance(obj, (list, tuple)):
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 obj = [ extract_dates(o) for o in obj ]
Thomas Kluyver
Replace references to unicode and basestring
r13353 elif isinstance(obj, string_types):
MinRK
separate single-date parsing from walking extraction...
r13520 obj = parse_date(obj)
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 return obj
MinRK
handle datetime objects in Session...
r4008 def squash_dates(obj):
"""squash datetime objects into ISO8601 strings"""
if isinstance(obj, dict):
MinRK
don't clobber existing dicts in extract_dates/squash_dates
r4010 obj = dict(obj) # don't clobber
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k,v in iteritems(obj):
MinRK
handle datetime objects in Session...
r4008 obj[k] = squash_dates(v)
elif isinstance(obj, (list, tuple)):
obj = [ squash_dates(o) for o in obj ]
elif isinstance(obj, datetime):
MinRK
use `isoformat()` in jsonutil...
r11143 obj = obj.isoformat()
MinRK
handle datetime objects in Session...
r4008 return obj
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 def date_default(obj):
MinRK
handle datetime objects in Session...
r4008 """default function for packing datetime objects in JSON."""
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 if isinstance(obj, datetime):
MinRK
use `isoformat()` in jsonutil...
r11143 return obj.isoformat()
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006 else:
raise TypeError("%r is not JSON serializable"%obj)
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 # constants for identifying png/jpeg data
PNG = b'\x89PNG\r\n\x1a\n'
MinRK
fix png/jpeg b64-encoding check
r10051 # front of PNG base64-encoded
PNG64 = b'iVBORw0KG'
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 JPEG = b'\xff\xd8'
MinRK
fix png/jpeg b64-encoding check
r10051 # front of JPEG base64-encoded
JPEG64 = b'/9'
Brian E. Granger
Adding PDFFormatter and kernel side handling of PDF display data.
r15121 # front of PDF base64-encoded
PDF64 = b'JVBER'
MinRK
move _encode_binary to jsonutil.encode_images...
r7737
def encode_images(format_dict):
"""b64-encodes images in a displaypub format dict
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 Perhaps this should be handled in json_clean itself?
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
expand encode_images docstring
r7746 Parameters
----------
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
expand encode_images docstring
r7746 format_dict : dict
A dictionary of display data keyed by mime-type
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
expand encode_images docstring
r7746 Returns
-------
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
expand encode_images docstring
r7746 format_dict : dict
A copy of the same dictionary,
Brian E. Granger
Adding PDFFormatter and kernel side handling of PDF display data.
r15121 but binary image data ('image/png', 'image/jpeg' or 'application/pdf')
MinRK
expand encode_images docstring
r7746 is base64-encoded.
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 """
encoded = format_dict.copy()
MinRK
tweak double-encode logic for image data...
r10048
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 pngdata = format_dict.get('image/png')
MinRK
tweak double-encode logic for image data...
r10048 if isinstance(pngdata, bytes):
# make sure we don't double-encode
MinRK
fix png/jpeg b64-encoding check
r10051 if not pngdata.startswith(PNG64):
MinRK
tweak double-encode logic for image data...
r10048 pngdata = encodebytes(pngdata)
encoded['image/png'] = pngdata.decode('ascii')
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 jpegdata = format_dict.get('image/jpeg')
MinRK
tweak double-encode logic for image data...
r10048 if isinstance(jpegdata, bytes):
# make sure we don't double-encode
MinRK
fix png/jpeg b64-encoding check
r10051 if not jpegdata.startswith(JPEG64):
MinRK
tweak double-encode logic for image data...
r10048 jpegdata = encodebytes(jpegdata)
encoded['image/jpeg'] = jpegdata.decode('ascii')
Brian E. Granger
Adding PDFFormatter and kernel side handling of PDF display data.
r15121 pdfdata = format_dict.get('application/pdf')
if isinstance(pdfdata, bytes):
# make sure we don't double-encode
if not pdfdata.startswith(PDF64):
pdfdata = encodebytes(pdfdata)
encoded['application/pdf'] = pdfdata.decode('ascii')
MinRK
move _encode_binary to jsonutil.encode_images...
r7737 return encoded
MinRK
merge IPython.parallel.streamsession into IPython.zmq.session...
r4006
Fernando Perez
Created JSON-safety utilities....
r2947 def json_clean(obj):
"""Clean an object to ensure it's safe to encode in JSON.
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 Atomic, immutable objects are returned unmodified. Sets and tuples are
converted to lists, lists are copied and dicts are also copied.
Note: dicts whose keys could cause collisions upon encoding (such as a dict
with both the number 1 and the string '1' as keys) will cause a ValueError
to be raised.
Parameters
----------
obj : any python object
Returns
-------
out : object
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 A version of the input which will not cause an encoding error when
encoded as JSON. Note that this function does not *encode* its inputs,
it simply sanitizes it so that there will be no encoding errors later.
Examples
--------
>>> json_clean(4)
4
Thomas Kluyver
Fix tests in utils
r13373 >>> json_clean(list(range(10)))
Fernando Perez
Created JSON-safety utilities....
r2947 [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
Thomas Kluyver
Fix doctests that relied on dict ordering in IPython.utils
r7012 >>> sorted(json_clean(dict(x=1, y=2)).items())
[('x', 1), ('y', 2)]
>>> sorted(json_clean(dict(x=1, y=2, z=[1,2,3])).items())
[('x', 1), ('y', 2), ('z', [1, 2, 3])]
Fernando Perez
Created JSON-safety utilities....
r2947 >>> json_clean(True)
True
"""
MinRK
re-cast int/float subclasses to int/float in json_clean...
r13706 # types that are 'atomic' and ok in json as-is.
atomic_ok = (unicode_type, type(None))
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 # containers that we need to convert into lists
container_to_list = (tuple, set, types.GeneratorType)
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
clean nan/inf in json_clean...
r8021 if isinstance(obj, float):
# cast out-of-range floats to their reprs
MinRK
use math to check for nan/inf
r8022 if math.isnan(obj) or math.isinf(obj):
MinRK
clean nan/inf in json_clean...
r8021 return repr(obj)
MinRK
re-cast int/float subclasses to int/float in json_clean...
r13706 return float(obj)
if isinstance(obj, int):
# cast int to int, in case subclasses override __str__ (e.g. boost enum, #4598)
if isinstance(obj, bool):
# bools are ints, but we don't want to cast them to 0,1
return obj
return int(obj)
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 if isinstance(obj, atomic_ok):
return obj
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
MinRK
Don't treat bytes objects as json-safe...
r4719 if isinstance(obj, bytes):
Brandon Parsons
saner default encoding mechanism
r6716 return obj.decode(DEFAULT_ENCODING, 'replace')
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 if isinstance(obj, container_to_list) or (
Thomas Kluyver
Various Python 3 fixes in IPython.utils
r4764 hasattr(obj, '__iter__') and hasattr(obj, next_attr_name)):
Fernando Perez
Created JSON-safety utilities....
r2947 obj = list(obj)
Mikhail Korobov
P3K: fix DeprecationWarning under Python 3.x (base64.encodestring is deprecated)
r9041
Fernando Perez
Created JSON-safety utilities....
r2947 if isinstance(obj, list):
return [json_clean(x) for x in obj]
if isinstance(obj, dict):
# First, validate that the dict won't lose data in conversion due to
# key collisions after stringification. This can happen with keys like
# True and 'true' or 1 and '1', which collide in JSON.
nkeys = len(obj)
nkeys_collapsed = len(set(map(str, obj)))
if nkeys != nkeys_collapsed:
raise ValueError('dict can not be safely converted to JSON: '
'key collision would lead to dropped values')
# If all OK, proceed by making the new dict that will be json-safe
out = {}
Thomas Kluyver
Fix references to dict.iteritems and dict.itervalues
r13361 for k,v in iteritems(obj):
Fernando Perez
Created JSON-safety utilities....
r2947 out[str(k)] = json_clean(v)
return out
# If we get here, we don't know how to handle the object, so we just get
# its repr and return that. This will catch lambdas, open sockets, class
# objects, and any other complicated contraption that json can't encode
return repr(obj)