From 0790f376ca9210538b893d24e6552c2fd033688b Mon Sep 17 00:00:00 2001
From: Dave Halter <davidhalter88@gmail.com>
Date: Thu, 2 Jul 2020 03:34:44 +0200
Subject: [PATCH] Some Python 2 removals

---
 scripts/profile_output.py | 6 +-----
 setup.py                  | 1 -
 test/completion/basic.py  | 8 --------
 test/test_file_io.py      | 4 ++--
 4 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/scripts/profile_output.py b/scripts/profile_output.py
index 36b230ba..53e0046c 100755
--- a/scripts/profile_output.py
+++ b/scripts/profile_output.py
@@ -18,11 +18,7 @@ Options:
 """
 
 import time
-try:
-    # For Python 2
-    import cProfile as profile
-except ImportError:
-    import profile
+import profile
 import pstats
 
 from docopt import docopt
diff --git a/setup.py b/setup.py
index 84d79624..044d7d5a 100755
--- a/setup.py
+++ b/setup.py
@@ -37,7 +37,6 @@ setup(name='jedi',
       install_requires=install_requires,
       extras_require={
           'testing': [
-              # Pytest 5 doesn't support Python 2 anymore.
               'pytest<6.0.0',
               # docopt for sith doctests
               'docopt',
diff --git a/test/completion/basic.py b/test/completion/basic.py
index d0494ec3..97bfeecd 100644
--- a/test/completion/basic.py
+++ b/test/completion/basic.py
@@ -291,14 +291,6 @@ except ImportError as i_a:
     i_a
     #? ImportError()
     i_a
-try:
-    import math
-except ImportError, i_b:
-    # TODO check this only in Python2
-    ##? ['i_b']
-    i_b
-    ##? ImportError()
-    i_b
 
 
 class MyException(Exception):
diff --git a/test/test_file_io.py b/test/test_file_io.py
index 61b5b1c3..bbf2170b 100644
--- a/test/test_file_io.py
+++ b/test/test_file_io.py
@@ -15,7 +15,7 @@ def test_folder_io_walk():
     root, folder_ios, file_ios = next(iterator)
     assert folder_ios
     assert root.path == join(root_dir, 'ns2')
-    folder_ios[:] = []  # Not folder_ios.clear() because Python 2
+    folder_ios.clear()
     assert next(iterator, None) is None
 
 
@@ -23,5 +23,5 @@ def test_folder_io_walk2():
     root_dir = get_example_dir('namespace_package')
     iterator = FolderIO(root_dir).walk()
     root, folder_ios, file_ios = next(iterator)
-    folder_ios[:] = []  # Not folder_ios.clear() because Python 2
+    folder_ios.clear()
     assert next(iterator, None) is None