Cleaned up some of the python 2 code

Author: MSeal

jupyter_client/blocking/client.py

@@ -5,36 +5,20 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 from functools import partial
 from getpass import getpass
-try:
-    from queue import Empty  # Python 3
-except ImportError:
-    from Queue import Empty  # Python 2
+from queue import Empty
 import sys
 import time
 
 import zmq
 
+from time import monotonic
 from traitlets import Type
 from jupyter_client.channels import HBChannel
 from jupyter_client.client import KernelClient
 from .channels import ZMQSocketChannel
 
-try:
-    monotonic = time.monotonic
-except AttributeError:
-    # py2
-    monotonic = time.time # close enough
-
-try:
-    TimeoutError
-except NameError:
-    # py2
-    TimeoutError = RuntimeError
-
 
 def reqrep(meth, channel='shell'):
     def wrapped(self, *args, **kwargs):
@@ -45,12 +29,12 @@ def wrapped(self, *args, **kwargs):
             return msg_id
 
         return self._recv_reply(msg_id, timeout=timeout, channel=channel)
-    
+
     if not meth.__doc__:
         # python -OO removes docstrings,
         # so don't bother building the wrapped docstring
         return wrapped
-    
+
     basedoc, _ = meth.__doc__.split('Returns\n', 1)
     parts = [basedoc.strip()]
     if 'Parameters' not in basedoc:
@@ -76,14 +60,14 @@ def wrapped(self, *args, **kwargs):
 
 class BlockingKernelClient(KernelClient):
     """A KernelClient with blocking APIs
-    
+
     ``get_[channel]_msg()`` methods wait for and return messages on channels,
     raising :exc:`queue.Empty` if no message arrives within ``timeout`` seconds.
     """
-    
+
     def wait_for_ready(self, timeout=None):
         """Waits for a response when a client is blocked
-        
+
         - Sets future time for timeout
         - Blocks on shell channel until a message is received
         - Exit if the kernel has died

jupyter_client/channels.py

@@ -3,8 +3,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import
-
 import atexit
 import errno
 from threading import Thread, Event

jupyter_client/client.py

@@ -3,9 +3,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import
 from jupyter_client.channels import major_protocol_version
-from ipython_genutils.py3compat import string_types, iteritems
 
 import zmq
 
@@ -25,10 +23,10 @@ def validate_string_dict(dct):
     """Validate that the input is a dict with string keys and values.
 
     Raises ValueError if not."""
-    for k,v in iteritems(dct):
-        if not isinstance(k, string_types):
+    for k,v in dct.items():
+        if not isinstance(k, str):
             raise ValueError('key %r in dict must be a string' % k)
-        if not isinstance(v, string_types):
+        if not isinstance(v, str):
             raise ValueError('value %r in dict must be a string' % v)
 
 
@@ -264,7 +262,7 @@ def execute(self, code, silent=False, store_history=True,
 
 
         # Don't waste network traffic if inputs are invalid
-        if not isinstance(code, string_types):
+        if not isinstance(code, str):
             raise ValueError('code %r must be a string' % code)
         validate_string_dict(user_expressions)
 
@@ -384,7 +382,7 @@ def kernel_info(self):
 
     def comm_info(self, target_name=None):
         """Request comm info
-        
+
         Returns
         -------
         The msg_id of the message sent

jupyter_client/connect.py

@@ -7,9 +7,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-
-from __future__ import absolute_import
-
 import errno
 import glob
 import json
@@ -27,7 +24,7 @@
 from .localinterfaces import localhost
 from ipython_genutils.path import filefind
 from ipython_genutils.py3compat import (
-    bytes_to_str, cast_bytes, cast_bytes_py2, string_types,
+    bytes_to_str, cast_bytes, cast_bytes_py2,
 )
 from traitlets import (
     Bool, Integer, Unicode, CaselessStrEnum, Instance, Type, observe
@@ -195,7 +192,7 @@ def find_connection_file(filename='kernel-*.json', path=None, profile=None):
         warnings.warn("Jupyter has no profiles. profile=%s has been ignored." % profile)
     if path is None:
         path = ['.', jupyter_runtime_dir()]
-    if isinstance(path, string_types):
+    if isinstance(path, str):
         path = [path]
 
     try:
@@ -254,7 +251,7 @@ def tunnel_to_kernel(connection_info, sshserver, sshkey=None):
         The five ports on localhost that have been forwarded to the kernel.
     """
     from .ssh import tunnel
-    if isinstance(connection_info, string_types):
+    if isinstance(connection_info, str):
         # it's a path, unpack it
         with open(connection_info) as f:
             connection_info = json.loads(f.read())

jupyter_client/ioloop/manager.py

@@ -3,8 +3,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import
-
 from tornado import ioloop
 from zmq.eventloop.zmqstream import ZMQStream
 

jupyter_client/ioloop/restarter.py

@@ -7,7 +7,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import absolute_import
 import warnings
 
 from zmq.eventloop import ioloop

jupyter_client/jsonutil.py

@@ -12,8 +12,7 @@
 from dateutil.tz import tzlocal
 
 from ipython_genutils import py3compat
-from ipython_genutils.py3compat import string_types, iteritems
-next_attr_name = '__next__' if py3compat.PY3 else 'next'
+next_attr_name = '__next__' # Not sure what downstream library uses this, but left it to be safe
 
 #-----------------------------------------------------------------------------
 # Globals and constants
@@ -33,7 +32,7 @@
 
 def _ensure_tzinfo(dt):
     """Ensure a datetime object has tzinfo
-    
+
     If no tzinfo is present, add tzlocal
     """
     if not dt.tzinfo:
@@ -46,7 +45,7 @@ def _ensure_tzinfo(dt):
 
 def parse_date(s):
     """parse an ISO8601 date string
-    
+
     If it is None or not a valid ISO8601 timestamp,
     it will be returned unmodified.
     Otherwise, it will return a datetime object.
@@ -63,20 +62,20 @@ def extract_dates(obj):
     """extract ISO8601 dates from unpacked JSON"""
     if isinstance(obj, dict):
         new_obj = {} # don't clobber
-        for k,v in iteritems(obj):
+        for k,v in obj.items():
             new_obj[k] = extract_dates(v)
         obj = new_obj
     elif isinstance(obj, (list, tuple)):
         obj = [ extract_dates(o) for o in obj ]
-    elif isinstance(obj, string_types):
+    elif isinstance(obj, str):
         obj = parse_date(obj)
     return obj
 
 def squash_dates(obj):
     """squash datetime objects into ISO8601 strings"""
     if isinstance(obj, dict):
         obj = dict(obj) # don't clobber
-        for k,v in iteritems(obj):
+        for k,v in obj.items():
             obj[k] = squash_dates(v)
     elif isinstance(obj, (list, tuple)):
         obj = [ squash_dates(o) for o in obj ]

jupyter_client/kernelspec.py

@@ -13,7 +13,6 @@
 
 pjoin = os.path.join
 
-from ipython_genutils.py3compat import PY3
 from traitlets import (
     HasTraits, List, Unicode, Dict, Set, Bool, Type, CaselessStrEnum
 )
@@ -22,7 +21,7 @@
 from jupyter_core.paths import jupyter_data_dir, jupyter_path, SYSTEM_JUPYTER_PATH
 
 
-NATIVE_KERNEL_NAME = 'python3' if PY3 else 'python2'
+NATIVE_KERNEL_NAME = 'python3'
 
 
 class KernelSpec(HasTraits):

jupyter_client/kernelspecapp.py

@@ -18,19 +18,14 @@
 from . import __version__
 from .kernelspec import KernelSpecManager
 
-try:
-    raw_input
-except NameError:
-    # py3
-    raw_input = input
 
 class ListKernelSpecs(JupyterApp):
     version = __version__
     description = """List installed kernel specifications."""
     kernel_spec_manager = Instance(KernelSpecManager)
     json_output = Bool(False, help='output spec name and location as machine-readable json.',
             config=True)
-    
+
     flags = {'json': ({'ListKernelSpecs': {'json_output': True}},
                 "output spec name and location as machine-readable json."),
              'debug': base_flags['debug'],
@@ -71,7 +66,7 @@ def path_key(item):
 class InstallKernelSpec(JupyterApp):
     version = __version__
     description = """Install a kernel specification directory.
-    
+
     Given a SOURCE DIRECTORY containing a kernel spec,
     jupyter will copy that directory into one of the Jupyter kernel directories.
     The default is to install kernelspecs for all users.
@@ -157,44 +152,44 @@ class RemoveKernelSpec(JupyterApp):
     version = __version__
     description = """Remove one or more Jupyter kernelspecs by name."""
     examples = """jupyter kernelspec remove python2 [my_kernel ...]"""
-    
+
     force = Bool(False, config=True,
         help="""Force removal, don't prompt for confirmation."""
     )
     spec_names = List(Unicode())
-    
+
     kernel_spec_manager = Instance(KernelSpecManager)
     def _kernel_spec_manager_default(self):
         return KernelSpecManager(data_dir=self.data_dir, parent=self)
-    
+
     flags = {
         'f': ({'RemoveKernelSpec': {'force': True}}, force.get_metadata('help')),
     }
     flags.update(JupyterApp.flags)
-    
+
     def parse_command_line(self, argv):
         super(RemoveKernelSpec, self).parse_command_line(argv)
         # accept positional arg as profile name
         if self.extra_args:
             self.spec_names = sorted(set(self.extra_args)) # remove duplicates
         else:
             self.exit("No kernelspec specified.")
-    
+
     def start(self):
         self.kernel_spec_manager.ensure_native_kernel = False
         spec_paths = self.kernel_spec_manager.find_kernel_specs()
         missing = set(self.spec_names).difference(set(spec_paths))
         if missing:
             self.exit("Couldn't find kernel spec(s): %s" % ', '.join(missing))
-        
+
         if not self.force:
             print("Kernel specs to remove:")
             for name in self.spec_names:
                 print("  %s\t%s" % (name.ljust(20), spec_paths[name]))
-            answer = raw_input("Remove %i kernel specs [y/N]: " % len(self.spec_names))
+            answer = input("Remove %i kernel specs [y/N]: " % len(self.spec_names))
             if not answer.lower().startswith('y'):
                 return
-        
+
         for kernel_name in self.spec_names:
             try:
                 path = self.kernel_spec_manager.remove_kernel_spec(kernel_name)

jupyter_client/launcher.py

@@ -8,7 +8,7 @@
 from subprocess import Popen, PIPE
 
 from ipython_genutils.encoding import getdefaultencoding
-from ipython_genutils.py3compat import cast_bytes_py2, PY3
+from ipython_genutils.py3compat import cast_bytes_py2
 from traitlets.log import get_logger
 
 
@@ -127,10 +127,7 @@ def launch_kernel(cmd, stdin=None, stdout=None, stderr=None, env=None,
         # because we want to interrupt the whole process group.
         # We don't use setpgrp, which is known to cause problems for kernels starting
         # certain interactive subprocesses, such as bash -i.
-        if PY3:
-            kwargs['start_new_session'] = True
-        else:
-            kwargs['preexec_fn'] = lambda: os.setsid()
+        kwargs['start_new_session'] = True
         if not independent:
             env['JPY_PARENT_PID'] = str(os.getpid())