Remove last bits of Python 2 compat code from package. (#574)

* CLN : Cleanup last bits of python 2 compat code

- remove coding cookies
- remove future import statements
- remove 2/3 conditionals
- remove try/excepts around imports which changed

* CLN : Remove u-string prefixes

	modified:   jupyter_client/adapter.py
	modified:   jupyter_client/connect.py
	modified:   jupyter_client/jsonutil.py
	modified:   jupyter_client/session.py
	modified:   jupyter_client/tests/test_kernelspec.py
	modified:   jupyter_client/tests/test_session.py

docs/conf.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-
 #
 # jupyter_client documentation build configuration file, created by
 # sphinx-quickstart on Tue May 26 15:41:51 2015.

jupyter_client/adapter.py

@@ -38,10 +38,10 @@ def extract_oname_v4(code, cursor_pos):
     line, _ = code_to_line(code, cursor_pos)
 
     oldline = line
-    line = _match_bracket.sub(u'', line)
+    line = _match_bracket.sub('', line)
     while oldline != line:
         oldline = line
-        line = _match_bracket.sub(u'', line)
+        line = _match_bracket.sub('', line)
 
     # remove everything after last open bracket
     line = _end_bracket.sub('', line)

jupyter_client/blocking/channels.py

@@ -6,10 +6,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-try:
-    from queue import Queue, Empty  # Py 3
-except ImportError:
-    from Queue import Queue, Empty  # Py 2
+from queue import Queue, Empty
 
 
 class ZMQSocketChannel(object):

jupyter_client/blocking/client.py

@@ -159,8 +159,6 @@ def _stdin_hook_default(self, msg):
         content = msg['content']
         if content.get('password', False):
             prompt = getpass
-        elif sys.version_info < (3,):
-            prompt = raw_input
         else:
             prompt = input
 

jupyter_client/connect.py

@@ -491,7 +491,7 @@ def load_connection_file(self, connection_file=None):
         """
         if connection_file is None:
             connection_file = self.connection_file
-        self.log.debug(u"Loading connection file %s", connection_file)
+        self.log.debug("Loading connection file %s", connection_file)
         with open(connection_file) as f:
             info = json.load(f)
         self.load_connection_info(info)

jupyter_client/jsonutil.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Utilities to manipulate JSON objects."""
 
 # Copyright (c) Jupyter Development Team.
@@ -37,7 +36,7 @@ def _ensure_tzinfo(dt):
     """
     if not dt.tzinfo:
         # No more naïve datetime objects!
-        warnings.warn(u"Interpreting naive datetime as local %s. Please add timezone info to timestamps." % dt,
+        warnings.warn("Interpreting naive datetime as local %s. Please add timezone info to timestamps." % dt,
             DeprecationWarning,
             stacklevel=4)
         dt = dt.replace(tzinfo=tzlocal())

jupyter_client/kernelspecapp.py

@@ -2,8 +2,6 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
 
-from __future__ import print_function
-
 import errno
 import os.path
 import sys

jupyter_client/session.py

@@ -17,18 +17,12 @@
 import hmac
 import logging
 import os
+import pickle
 import pprint
 import random
 import warnings
 from datetime import datetime
 
-try:
-    import cPickle
-    pickle = cPickle
-except:
-    cPickle = None
-    import pickle
-
 PICKLE_PROTOCOL = pickle.DEFAULT_PROTOCOL
 
 # We are using compare_digest to limit the surface of timing attacks
@@ -115,7 +109,7 @@ def new_id():
     id string (16 random bytes as hex-encoded text, chunks separated by '-')
     """
     buf = os.urandom(16)
-    return u'-'.join(b2a_hex(x).decode('ascii') for x in (
+    return '-'.join(b2a_hex(x).decode('ascii') for x in (
         buf[:4], buf[4:]
     ))
 
@@ -332,7 +326,7 @@ def _unpacker_changed(self, change):
         else:
             self.unpack = import_item(str(new))
 
-    session = CUnicode(u'', config=True,
+    session = CUnicode('', config=True,
         help="""The UUID identifying this session.""")
     def _session_default(self):
         u = new_id()

jupyter_client/ssh/tunnel.py

@@ -7,9 +7,6 @@
 #
 # Redistributed from IPython under the terms of the BSD License.
 
-
-from __future__ import print_function
-
 import atexit
 import os
 import re

jupyter_client/tests/test_jsonutil.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Test suite for our JSON utilities."""
 
 # Copyright (c) Jupyter Development Team.

jupyter_client/tests/test_kernelspec.py

@@ -1,4 +1,3 @@
-# coding: utf-8
 """Tests for the KernelSpecManager"""
 
 # Copyright (c) Jupyter Development Team.
@@ -156,7 +155,7 @@ def test_validate_kernel_name(self):
 
         for bad in [
             'has space',
-            u'ünicode',
+            'ünicode',
             '%percent',
             'question?',
         ]:

jupyter_client/tests/test_session.py

@@ -5,13 +5,9 @@
 
 import hmac
 import os
-import sys
 import uuid
 from datetime import datetime
-try:
-    from unittest import mock
-except ImportError:
-    import mock
+from unittest import mock
 
 import pytest
 
@@ -141,9 +137,8 @@ def test_send(self):
 
         # buffers must be contiguous
         buf = memoryview(os.urandom(16))
-        if sys.version_info >= (3,4):
-            with self.assertRaises(ValueError):
-                self.session.send(A, msg, ident=b'foo', buffers=[buf[::2]])
+        with self.assertRaises(ValueError):
+            self.session.send(A, msg, ident=b'foo', buffers=[buf[::2]])
 
         A.close()
         B.close()
@@ -154,17 +149,17 @@ def test_args(self):
         s = self.session
         self.assertTrue(s.pack is ss.default_packer)
         self.assertTrue(s.unpack is ss.default_unpacker)
-        self.assertEqual(s.username, os.environ.get('USER', u'username'))
+        self.assertEqual(s.username, os.environ.get('USER', 'username'))
 
         s = ss.Session()
-        self.assertEqual(s.username, os.environ.get('USER', u'username'))
+        self.assertEqual(s.username, os.environ.get('USER', 'username'))
 
         self.assertRaises(TypeError, ss.Session, pack='hi')
         self.assertRaises(TypeError, ss.Session, unpack='hi')
         u = str(uuid.uuid4())
-        s = ss.Session(username=u'carrot', session=u)
+        s = ss.Session(username='carrot', session=u)
         self.assertEqual(s.session, u)
-        self.assertEqual(s.username, u'carrot')
+        self.assertEqual(s.username, 'carrot')
 
     def test_tracking(self):
         """test tracking messages"""

jupyter_client/tests/utils.py

@@ -4,10 +4,7 @@
 import os
 pjoin = os.path.join
 import sys
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch
+from unittest.mock import patch
 
 import pytest
 from jupyter_client import AsyncKernelManager

setup.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# coding: utf-8
 
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.