Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(600)

Side by Side Diff: ports/python_modules/ipython/nacl.patch

Issue 165473002: Adds an IPython kernel running in NaCl, and a wrapper as a Chrome extension. Base URL: https://naclports.googlecode.com/svn/trunk/src
Patch Set: rebase to master Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ports/python-static/Setup.local ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 diff -r f628d005a84e IPython/external/pexpect/_pexpect.py 1 diff -aur ipython-1.1.0/IPython/core/prompts.py ipython-1.1.0-mod/IPython/core/p rompts.py
2 --- a/IPython/external/pexpect/_pexpect.py» Wed Dec 25 03:31:05 2013 +0000 2 --- a/IPython/core/prompts.py» 2013-09-09 17:36:34.000000000 -0400
3 +++ b/IPython/external/pexpect/_pexpect.py» Mon Dec 30 16:24:58 2013 +0000 3 +++ b/IPython/core/prompts.py» 2014-05-01 14:04:55.414706282 -0400
4 @@ -145,7 +145,9 @@
5 # fixed once ipython starts. This reduces the runtime overhead of computing
6 # prompt strings.
7 USER = py3compat.str_to_unicode(os.environ.get("USER",''))
8 -HOSTNAME = py3compat.str_to_unicode(socket.gethostname())
9 +# NACLPORTS NOTE: sockets module is not present in naclports,
10 +# so we sent HOSTNAME to empty
11 +HOSTNAME = '' #py3compat.str_to_unicode(socket.gethostname())
12 HOSTNAME_SHORT = HOSTNAME.split(".")[0]
13 ROOT_SYMBOL = "#" if (os.name=='nt' or os.getuid()==0) else "$"
14
15 diff -aur ipython-1.1.0/IPython/external/pexpect/_pexpect.py ipython-1.1.0-mod/I Python/external/pexpect/_pexpect.py
16 --- a/IPython/external/pexpect/_pexpect.py» 2013-09-09 17:36:34.000000000 -0 400
17 +++ b/IPython/external/pexpect/_pexpect.py» 2014-05-01 14:02:38.743366957 -0 400
4 @@ -70,7 +70,7 @@ 18 @@ -70,7 +70,7 @@
5 import select 19 import select
6 import re 20 import re
7 import struct 21 import struct
8 - import resource 22 - import resource
9 + #import resource 23 + #import resource
10 import types 24 import types
11 import pty 25 import pty
12 import tty 26 import tty
13 @@ -568,7 +568,8 @@ 27 @@ -568,7 +568,8 @@
14 # This is a serious limitation, but not a show stopper. 28 # This is a serious limitation, but not a show stopper.
15 pass 29 pass
16 # Do not allow child to inherit open file descriptors from parent. 30 # Do not allow child to inherit open file descriptors from parent.
17 - max_fd = resource.getrlimit(resource.RLIMIT_NOFILE)[0] 31 - max_fd = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
18 + #max_fd = resource.getrlimit(resource.RLIMIT_NOFILE)[0] 32 + #max_fd = resource.getrlimit(resource.RLIMIT_NOFILE)[0]
19 + max_fd = 1024 33 + max_fd = 1024
20 for i in range (3, max_fd): 34 for i in range (3, max_fd):
21 try: 35 try:
22 os.close (i) 36 os.close (i)
37 diff -aur ipython-1.1.0/IPython/kernel/__init__.py ipython-1.1.0-mod/IPython/ker nel/__init__.py
38 --- a/IPython/kernel/__init__.py 2013-09-09 17:36:34.000000000 -0400
39 +++ b/IPython/kernel/__init__.py 2014-05-01 15:22:57.690063237 -0400
40 @@ -1,11 +1,6 @@
41 """IPython kernels and associated utilities"""
42
43 -# just for friendlier zmq version check
44 -from . import zmq
45 -
46 -from .connect import *
47 -from .launcher import *
48 -from .client import KernelClient
49 -from .manager import KernelManager
50 -from .blocking import BlockingKernelClient
51 -from .multikernelmanager import MultiKernelManager
52 +# NACLPORTS NOTE:
53 +# This file is left empty because this package
54 +# is only needed for IPython/kernel/zmq/pylab/backend_inline.py
55 +# which in turn does not require the rest of the package to load.
56 diff -aur ipython-1.1.0/IPython/kernel/zmq/__init__.py ipython-1.1.0-mod/IPython /kernel/zmq/__init__.py
57 --- a/IPython/kernel/zmq/__init__.py 2013-09-09 17:36:34.000000000 -0400
58 +++ b/IPython/kernel/zmq/__init__.py 2014-05-01 15:22:44.529935812 -0400
59 @@ -5,13 +5,7 @@
60 # the file COPYING.txt, distributed as part of this software.
61 #-----------------------------------------------------------------------------
62
63 -#-----------------------------------------------------------------------------
64 -# Verify zmq version dependency >= 2.1.11
65 -#-----------------------------------------------------------------------------
66 -
67 -from IPython.utils.zmqrelated import check_for_zmq
68 -
69 -check_for_zmq('2.1.11', 'IPython.kernel.zmq')
70 -
71 -from .session import Session
72 -
73 +# NACLPORTS NOTE:
74 +# This file is left empty because this package
75 +# is only needed for IPython/kernel/zmq/pylab/backend_inline.py
76 +# which in turn does not require the rest of the package to load.
OLDNEW
« no previous file with comments | « ports/python-static/Setup.local ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698