hiro/emacs-ipython-notebook
1
0
Fork 0
mirror of https://github.com/vale981/emacs-ipython-notebook synced 2025-03-06 01:21:38 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix command template for windows

Browse source 
Windows did not like all those newlines. Less readable in the code but
at least it works.
This commit is contained in:
John Miller 2016-09-30 09:59:19 -05:00
parent 11756b0e04
commit 6ea5c255aa
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tools/testein.py
View file

@ -321,11 +321,14 @@ class ServerRunner(BaseRunner):
@staticmethod @staticmethod
def _parse_port_line(line): def _parse_port_line(line):
return line.strip().rsplit(':', 1)[-1].strip('/') port = line.strip().rsplit(':', 1)[-1].strip('/')
return port
def get_port(self): def get_port(self):
if self.port is None: if self.port is None:
self.port = self._parse_port_line(self.proc.stdout.readline().decode('utf-8')) val = self.proc.stdout.readline()
dval = val.decode('utf-8')
self.port = self._parse_port_line(dval)
return self.port return self.port
def start(self): def start(self):
@ -362,15 +365,7 @@ class ServerRunner(BaseRunner):
) )
return self.command_template.format(**fmtdata) return self.command_template.format(**fmtdata)
command_template = r""" command_template = r"""{ipython} notebook --notebook-dir {notebook_dir} --no-browser --debug 2>&1 | tee {server_log} | grep --line-buffered 'Notebook is running at' | head -n1"""
{ipython} notebook \
--notebook-dir {notebook_dir} \
--debug \
--no-browser 2>&1 \
| tee {server_log} \
| grep --line-buffered 'The IPython Notebook is running at' \
| head -n1
"""
def kill_subprocesses(pid, include=lambda x: True): def kill_subprocesses(pid, include=lambda x: True):