Merge pull request #8256 from minrk/less-utils.process

remove dependency on utils.process outside IPython

IPython/html/notebookapp.py

@@ -78,7 +78,6 from IPython.kernel.zmq.session import Session
 from IPython.nbformat.sign import NotebookNotary
 from IPython.utils.importstring import import_item
 from IPython.utils import submodule
-from IPython.utils.process import check_pid
 from IPython.utils.traitlets import (
     Dict, Unicode, Integer, List, Bool, Bytes, Instance,
     TraitError, Type,
@@ -88,7 +87,7 from IPython.utils.path import filefind, get_ipython_dir
 from IPython.utils.sysinfo import get_sys_info
 
 from .nbextensions import SYSTEM_NBEXTENSIONS_DIRS
-from .utils import url_path_join
+from .utils import url_path_join, check_pid
 
 #-----------------------------------------------------------------------------
 # Module globals

IPython/html/utils.py

@@ -5,8 +5,10
 
 from __future__ import print_function
 
+import errno
 import os
 import stat
+import sys
 
 try:
     from urllib.parse import quote, unquote
@@ -139,3 +141,30 def to_api_path(os_path, root=''):
     path = '/'.join(parts)
     return path
 
+
+# Copy of IPython.utils.process.check_pid:
+
+def _check_pid_win32(pid):
+    import ctypes
+    # OpenProcess returns 0 if no such process (of ours) exists
+    # positive int otherwise
+    return bool(ctypes.windll.kernel32.OpenProcess(1,0,pid))
+
+def _check_pid_posix(pid):
+    """Copy of IPython.utils.pro"""
+    try:
+        os.kill(pid, 0)
+    except OSError as err:
+        if err.errno == errno.ESRCH:
+            return False
+        elif err.errno == errno.EPERM:
+            # Don't have permission to signal the process - probably means it exists
+            return True
+        raise
+    else:
+        return True
+
+if sys.platform == 'win32':
+    check_pid = _check_pid_win32
+else:
+    check_pid = _check_pid_posix

jupyter_client/localinterfaces.py

@@ -1,16 +1,4
-"""Simple utility for building a list of local IPs using the socket module.
-This module defines two constants:
-
-LOCALHOST : The loopback interface, or the first interface that points to this
-            machine.  It will *almost* always be '127.0.0.1'
-
-LOCAL_IPS : A list of IP addresses, loopback first, that point to this machine.
-            This will include LOCALHOST, PUBLIC_IPS, and aliases for all hosts,
-            such as '0.0.0.0'.
-
-PUBLIC_IPS : A list of public IP addresses that point to this machine.
-             Use these to tell remote clients where to find you.
-"""
+"""Utilities for identifying local IP addresses."""
 
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
@@ -18,9 +6,9 PUBLIC_IPS : A list of public IP addresses that point to this machine.
 import os
 import re
 import socket
+from subprocess import Popen, PIPE
 
 from IPython.utils.data import uniq_stable
-from IPython.utils.process import get_output_error_code
 from warnings import warn
 
 
@@ -29,6 +17,14 PUBLIC_IPS = []
 
 LOCALHOST = ''
 
+def _get_output(cmd):
+    """Get output of a command, raising IOError if it fails"""
+    p = Popen(cmd, stdout=PIPE, stderr=PIPE)
+    stdout, stderr = p.communicate()
+    if p.returncode:
+        raise IOError("Failed to run %s: %s" % (cmd, stderr.decode('utf8', 'replace')))
+    return stdout.decode('utf8', 'replace')
+
 def _only_once(f):
     """decorator to only run a function once"""
     f.called = False
@@ -79,12 +75,11 def _populate_from_list(addrs):
 def _load_ips_ifconfig():
     """load ip addresses from `ifconfig` output (posix)"""
     
-    out, err, rc = get_output_error_code('ifconfig')
-    if rc:
+    try:
+        out = _get_output('ifconfig')
+    except (IOError, OSError):
         # no ifconfig, it's usually in /sbin and /sbin is not on everyone's PATH
-        out, err, rc = get_output_error_code('/sbin/ifconfig')
-    if rc:
-        raise IOError("no ifconfig: %s" % err)
+        out = _get_output('/sbin/ifconfig')
     
     lines = out.splitlines()
     addrs = []
@@ -100,9 +95,7 def _load_ips_ifconfig():
 
 def _load_ips_ip():
     """load ip addresses from `ip addr` output (Linux)"""
-    out, err, rc = get_output_error_code('ip addr')
-    if rc:
-        raise IOError("no ip: %s" % err)
+    out = _get_output(['ip', 'addr'])
     
     lines = out.splitlines()
     addrs = []
@@ -116,9 +109,7 _ipconfig_ipv4_pat = re.compile(r'ipv4.*?(\d+\.\d+\.\d+\.\d+)$', re.IGNORECASE)
 
 def _load_ips_ipconfig():
     """load ip addresses from `ipconfig` output (Windows)"""
-    out, err, rc = get_output_error_code('ipconfig')
-    if rc:
-        raise IOError("no ipconfig: %s" % err)
+    out = _get_output('ipconfig')
     
     lines = out.splitlines()
     addrs = []

jupyter_nbconvert/filters/markdown.py

@@ -23,7 +23,6 except ImportError as e:
 
 from jupyter_nbconvert.utils.pandoc import pandoc
 from jupyter_nbconvert.utils.exceptions import ConversionException
-from IPython.utils.process import get_output_error_code
 from IPython.utils.py3compat import cast_bytes
 from IPython.utils.version import check_version
 
@@ -130,11 +129,14 def _verify_node(cmd):
     cmd : string
         Node command to verify (i.e 'node')."""
     try:
-        out, err, return_code = get_output_error_code([cmd, '--version'])
+        p = subprocess.Popen([cmd, '--version'],
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+        out, _ = p.communicate()
+        out = out.decode('utf8', 'replace')
     except OSError:
         # Command not found
         return False
-    if return_code:
+    if p.returncode:
         # Command error
         return False
     return check_version(out.lstrip('v'), '0.9.12')

jupyter_nbconvert/tests/base.py

@@ -10,13 +10,14 import shlex
 import shutil
 import sys
 import unittest
+from subprocess import Popen, PIPE
 
 import nose.tools as nt
 
 from IPython.nbformat import v4, write
 from IPython.utils.tempdir import TemporaryWorkingDirectory
-from IPython.utils.process import get_output_error_code
-from IPython.utils.py3compat import string_types
+
+from IPython.utils.py3compat import string_types, bytes_to_str
 
 class TestsBase(unittest.TestCase):
     """Base tests class.  Contains useful fuzzy comparison and nbconvert
@@ -141,11 +142,13 class TestsBase(unittest.TestCase):
         if isinstance(parameters, string_types):
             parameters = shlex.split(parameters)
         cmd = [sys.executable, '-m', 'jupyter_nbconvert'] + parameters
-        stdout, stderr, retcode = get_output_error_code(cmd)
-        if not (retcode == 0 or ignore_return_code):
-            raise OSError(stderr)
-        return stdout, stderr
-    
+        p = Popen(cmd, stdout=PIPE, stderr=PIPE)
+        stdout, stderr = p.communicate()
+        if not (p.returncode == 0 or ignore_return_code):
+            raise OSError(bytes_to_str(stderr))
+        return stdout.decode('utf8', 'replace'), stderr.decode('utf8', 'replace')
+
+
 def assert_big_text_equal(a, b, chunk_size=80):
     """assert that large strings are equal
 

jupyter_nbconvert/utils/pandoc.py

@@ -11,7 +11,7 from io import TextIOWrapper, BytesIO
 
 from IPython.utils.py3compat import cast_bytes
 from IPython.utils.version import check_version
-from IPython.utils.process import is_cmd_found, FindCmdError
+from IPython.utils.py3compat import which
 
 from .exceptions import ConversionException
 
@@ -71,7 +71,7 def get_pandoc_version():
     global __version
 
     if __version is None:
-        if not is_cmd_found('pandoc'):
+        if not which('pandoc'):
             raise PandocMissing()
 
         out = subprocess.check_output(['pandoc', '-v'],