Merge pull request #4991 from 00Kai0/fix-py2dep

remove py2 dependence

Author: takluyver

notebook/auth/login.py

@@ -6,10 +6,8 @@
 import re
 import os
 
-try:
-    from urllib.parse import urlparse # Py 3
-except ImportError:
-    from urlparse import urlparse # Py 2
+from urllib.parse import urlparse
+
 import uuid
 
 from tornado.escape import url_escape

notebook/base/handlers.py

@@ -14,18 +14,10 @@
 import traceback
 import types
 import warnings
-try:
-    # py3
-    from http.client import responses
-    from http.cookies import Morsel
-except ImportError:
-    from httplib import responses
-    from Cookie import Morsel
-try:
-    from urllib.parse import urlparse # Py 3
-except ImportError:
-    from urlparse import urlparse # Py 2
+from http.client import responses
+from http.cookies import Morsel
 
+from urllib.parse import urlparse
 from jinja2 import TemplateNotFound
 from tornado import web, gen, escape, httputil
 from tornado.log import app_log
@@ -35,7 +27,7 @@
 
 from traitlets.config import Application
 from ipython_genutils.path import filefind
-from ipython_genutils.py3compat import string_types, PY3
+from ipython_genutils.py3compat import string_types
 
 import notebook
 from notebook._tz import utcnow
@@ -479,10 +471,6 @@ def check_host(self):
         if host.startswith('[') and host.endswith(']'):
             host = host[1:-1]
 
-        if not PY3:
-            # ip_address only accepts unicode on Python 2
-            host = host.decode('utf8', 'replace')
-
         try:
             addr = ipaddress.ip_address(host)
         except ValueError:

notebook/bundler/tests/test_bundler_api.py

@@ -12,10 +12,8 @@
     new_notebook, new_markdown_cell, new_code_cell, new_output,
 )
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch # py3
+from unittest.mock import patch
+
 
 def bundle(handler, model):
     """Bundler test stub. Echo the notebook path."""

notebook/bundler/tests/test_bundlerextension.py

@@ -7,11 +7,7 @@
 import shutil
 import unittest
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch # py2
-
+from unittest.mock import patch
 from ipython_genutils.tempdir import TemporaryDirectory
 from ipython_genutils import py3compat
 

notebook/nbconvert/tests/test_nbconvert_handlers.py

@@ -16,12 +16,7 @@
 
 from ipython_genutils.testing.decorators import onlyif_cmds_exist
 
-try: #PY3
-    from base64 import encodebytes
-except ImportError: #PY2
-    from base64 import encodestring as encodebytes
-
-
+from base64 import encodebytes
 
 
 class NbconvertAPI(object):

notebook/services/config/handlers.py

@@ -8,7 +8,6 @@
 import errno
 from tornado import web
 
-from ipython_genutils.py3compat import PY3
 from ...base.handlers import APIHandler
 
 class ConfigHandler(APIHandler):

notebook/services/contents/fileio.py

@@ -24,10 +24,7 @@
 from traitlets.config import Configurable
 from traitlets import Bool
 
-try: #PY3
-    from base64 import encodebytes, decodebytes
-except ImportError: #PY2
-    from base64 import encodestring as encodebytes, decodestring as decodebytes
+from base64 import encodebytes, decodebytes
 
 
 def replace_file(src, dst):

notebook/services/contents/filemanager.py

@@ -34,11 +34,7 @@
 from notebook.base.handlers import AuthenticatedFileHandler
 from notebook.transutils import _
 
-try:
-    from os.path import samefile
-except ImportError:
-    # windows + py2
-    from notebook.utils import samefile_simple as samefile
+from os.path import samefile
 
 _script_exporter = None
 

notebook/tests/launchnotebook.py

@@ -13,10 +13,7 @@
 
 pjoin = os.path.join
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch #py2
+from unittest.mock import patch
 
 import requests
 from tornado.ioloop import IOLoop

notebook/tests/test_nbextensions.py

@@ -14,10 +14,7 @@
 from traitlets.tests.utils import check_help_all_output
 from unittest import TestCase
 
-try:
-    from unittest.mock import patch
-except ImportError:
-    from mock import patch # py2
+from unittest.mock import patch
 
 import ipython_genutils.testing.decorators as dec
 from ipython_genutils import py3compat