| Index: ports/python_modules/ipython/nacl.patch
|
| diff --git a/ports/python_modules/ipython/nacl.patch b/ports/python_modules/ipython/nacl.patch
|
| index f5e86b392ba0a7245784afb4bc9438c3639cfc99..2e03a718161dcd114d808c7b393c7c2601d1cb5c 100644
|
| --- a/ports/python_modules/ipython/nacl.patch
|
| +++ b/ports/python_modules/ipython/nacl.patch
|
| @@ -1,6 +1,20 @@
|
| -diff -r f628d005a84e IPython/external/pexpect/_pexpect.py
|
| ---- a/IPython/external/pexpect/_pexpect.py Wed Dec 25 03:31:05 2013 +0000
|
| -+++ b/IPython/external/pexpect/_pexpect.py Mon Dec 30 16:24:58 2013 +0000
|
| +diff -aur ipython-1.1.0/IPython/core/prompts.py ipython-1.1.0-mod/IPython/core/prompts.py
|
| +--- a/IPython/core/prompts.py 2013-09-09 17:36:34.000000000 -0400
|
| ++++ b/IPython/core/prompts.py 2014-05-01 14:04:55.414706282 -0400
|
| +@@ -145,7 +145,9 @@
|
| + # fixed once ipython starts. This reduces the runtime overhead of computing
|
| + # prompt strings.
|
| + USER = py3compat.str_to_unicode(os.environ.get("USER",''))
|
| +-HOSTNAME = py3compat.str_to_unicode(socket.gethostname())
|
| ++# NACLPORTS NOTE: sockets module is not present in naclports,
|
| ++# so we sent HOSTNAME to empty
|
| ++HOSTNAME = '' #py3compat.str_to_unicode(socket.gethostname())
|
| + HOSTNAME_SHORT = HOSTNAME.split(".")[0]
|
| + ROOT_SYMBOL = "#" if (os.name=='nt' or os.getuid()==0) else "$"
|
| +
|
| +diff -aur ipython-1.1.0/IPython/external/pexpect/_pexpect.py ipython-1.1.0-mod/IPython/external/pexpect/_pexpect.py
|
| +--- a/IPython/external/pexpect/_pexpect.py 2013-09-09 17:36:34.000000000 -0400
|
| ++++ b/IPython/external/pexpect/_pexpect.py 2014-05-01 14:02:38.743366957 -0400
|
| @@ -70,7 +70,7 @@
|
| import select
|
| import re
|
| @@ -20,3 +34,43 @@ diff -r f628d005a84e IPython/external/pexpect/_pexpect.py
|
| for i in range (3, max_fd):
|
| try:
|
| os.close (i)
|
| +diff -aur ipython-1.1.0/IPython/kernel/__init__.py ipython-1.1.0-mod/IPython/kernel/__init__.py
|
| +--- a/IPython/kernel/__init__.py 2013-09-09 17:36:34.000000000 -0400
|
| ++++ b/IPython/kernel/__init__.py 2014-05-01 15:22:57.690063237 -0400
|
| +@@ -1,11 +1,6 @@
|
| + """IPython kernels and associated utilities"""
|
| +
|
| +-# just for friendlier zmq version check
|
| +-from . import zmq
|
| +-
|
| +-from .connect import *
|
| +-from .launcher import *
|
| +-from .client import KernelClient
|
| +-from .manager import KernelManager
|
| +-from .blocking import BlockingKernelClient
|
| +-from .multikernelmanager import MultiKernelManager
|
| ++# NACLPORTS NOTE:
|
| ++# This file is left empty because this package
|
| ++# is only needed for IPython/kernel/zmq/pylab/backend_inline.py
|
| ++# which in turn does not require the rest of the package to load.
|
| +diff -aur ipython-1.1.0/IPython/kernel/zmq/__init__.py ipython-1.1.0-mod/IPython/kernel/zmq/__init__.py
|
| +--- a/IPython/kernel/zmq/__init__.py 2013-09-09 17:36:34.000000000 -0400
|
| ++++ b/IPython/kernel/zmq/__init__.py 2014-05-01 15:22:44.529935812 -0400
|
| +@@ -5,13 +5,7 @@
|
| + # the file COPYING.txt, distributed as part of this software.
|
| + #-----------------------------------------------------------------------------
|
| +
|
| +-#-----------------------------------------------------------------------------
|
| +-# Verify zmq version dependency >= 2.1.11
|
| +-#-----------------------------------------------------------------------------
|
| +-
|
| +-from IPython.utils.zmqrelated import check_for_zmq
|
| +-
|
| +-check_for_zmq('2.1.11', 'IPython.kernel.zmq')
|
| +-
|
| +-from .session import Session
|
| +-
|
| ++# NACLPORTS NOTE:
|
| ++# This file is left empty because this package
|
| ++# is only needed for IPython/kernel/zmq/pylab/backend_inline.py
|
| ++# which in turn does not require the rest of the package to load.
|
|
|