##// END OF EJS Templates
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.

File last commit:

r4725:7bde2f38
r5174:66077063
Show More
__init__.py
42 lines | 1.5 KiB | text/x-python | PythonLexer
MinRK
cleaner error on pyzmq < 2.0.10.
r3317 #-----------------------------------------------------------------------------
# Copyright (C) 2010 The IPython Development Team
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING.txt, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
MinRK
update zmq dependency to 2.1.4
r4028 # Verify zmq version dependency >= 2.1.4
MinRK
cleaner error on pyzmq < 2.0.10.
r3317 #-----------------------------------------------------------------------------
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 import re
MinRK
warn on detection of libzmq 3
r4248 import warnings
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 def check_for_zmq(minimum_version, module='IPython.zmq'):
min_vlist = [int(n) for n in minimum_version.split('.')]
MinRK
cleaner error on pyzmq < 2.0.10.
r3317
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 try:
import zmq
except ImportError:
raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))
MinRK
cleaner error on pyzmq < 2.0.10.
r3317
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 pyzmq_version = zmq.__version__
vlist = [int(n) for n in re.findall(r'\d+', pyzmq_version)]
MinRK
cleaner error on pyzmq < 2.0.10.
r3317
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 if 'dev' not in pyzmq_version and vlist < min_vlist:
raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
module, minimum_version, pyzmq_version))
MinRK
cleaner error on pyzmq < 2.0.10.
r3317
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 # fix missing DEALER/ROUTER aliases in pyzmq < 2.1.9
if not hasattr(zmq, 'DEALER'):
zmq.DEALER = zmq.XREQ
if not hasattr(zmq, 'ROUTER'):
zmq.ROUTER = zmq.XREP
MinRK
warn on detection of libzmq 3
r4248
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 if zmq.zmq_version() >= '4.0.0':
warnings.warn("""libzmq 4 detected.
It is unlikely that IPython's zmq code will work properly.
Please install libzmq stable, which is 2.1.x or 2.2.x""",
RuntimeWarning)
MinRK
warn on detection of libzmq 3
r4248
MinRK
use ROUTER/DEALER socket names instead of XREP/XREQ...
r4725 check_for_zmq('2.1.4')