Merge pull request #236 from QuLogic/remove-genutils

Remove use of ipython_genutils

Author: Carreau

.github/workflows/python-package.yml

@@ -26,7 +26,7 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip check-manifest
-        pip install pytest nose
+        pip install pytest
         pip install .
         python -m ipykernel.kernelspec --user
     - name: Test with pytest

jupyter_console/ptshell.py

@@ -11,14 +11,14 @@
 import signal
 import subprocess
 import sys
+from tempfile import TemporaryDirectory
 import time
 from warnings import warn
 
 from typing import Dict as DictType, Any as AnyType
 
 from zmq import ZMQError
 from IPython.core import page
-from ipython_genutils.tempdir import NamedFileInTemporaryDirectory
 from traitlets import (
     Bool,
     Integer,
@@ -975,24 +975,22 @@ def handle_image_stream(self, data, mime):
         imageformat = self._imagemime[mime]
         fmt = dict(format=imageformat)
         args = [s.format(**fmt) for s in self.stream_image_handler]
-        with open(os.devnull, 'w') as devnull:
-            proc = subprocess.Popen(
-                args, stdin=subprocess.PIPE,
-                stdout=devnull, stderr=devnull)
+        with subprocess.Popen(args, stdin=subprocess.PIPE,
+                              stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL) as proc:
             proc.communicate(raw)
-        return (proc.returncode == 0)
+            return (proc.returncode == 0)
 
     def handle_image_tempfile(self, data, mime):
         raw = base64.decodebytes(data[mime].encode('ascii'))
         imageformat = self._imagemime[mime]
         filename = 'tmp.{0}'.format(imageformat)
-        with NamedFileInTemporaryDirectory(filename) as f, \
-                open(os.devnull, 'w') as devnull:
-            f.write(raw)
-            f.flush()
-            fmt = dict(file=f.name, format=imageformat)
+        with TemporaryDirectory() as tempdir:
+            fullpath = os.path.join(tempdir, filename)
+            with open(fullpath, 'wb') as f:
+                f.write(raw)
+            fmt = dict(file=fullpath, format=imageformat)
             args = [s.format(**fmt) for s in self.tempfile_image_handler]
-            rc = subprocess.call(args, stdout=devnull, stderr=devnull)
+            rc = subprocess.call(args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
         return (rc == 0)
 
     def handle_image_callable(self, data, mime):

jupyter_console/tests/test_image_handler.py

@@ -1,16 +1,16 @@
 # Copyright (c) IPython Development Team.
 # Distributed under the terms of the Modified BSD License.
 
+import base64
 import os
 import sys
+from tempfile import TemporaryDirectory
 import unittest
-import base64
-
 from unittest.mock import patch
 
+import pytest
+
 from jupyter_console.ptshell import ZMQTerminalInteractiveShell
-from ipython_genutils.tempdir import TemporaryDirectory
-from ipython_genutils.testing.decorators import skip_without
 
 
 SCRIPT_PATH = os.path.join(
@@ -48,8 +48,8 @@ def raise_if_called(*args, **kwds):
         shell.handle_image(None, None)  # arguments are dummy
         assert len(pil_called_with) == 1
 
-    @skip_without('PIL')
     def test_handle_image_PIL(self):
+        pytest.importorskip('PIL')
         from PIL import Image, ImageShow
 
         open_called_with = []