Remove unittest2

This was a backports library that is no longer necessary for any python versions currently supported by rope.
python-rope · Nov 21, 2022 · eb6c3c7 · eb6c3c7
1 parent d3fca6a
commit eb6c3c7
Show file tree

Hide file tree

Showing 36 changed files with 36 additions and 144 deletions.
diff --git a/ropetest/__init__.py b/ropetest/__init__.py
@@ -1,9 +1,6 @@
 import sys
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import ropetest.projecttest
 import ropetest.codeanalyzetest

diff --git a/ropetest/advanced_oi_test.py b/ropetest/advanced_oi_test.py
@@ -2,10 +2,7 @@
 
 from rope.base.builtins import Str
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.libutils
 import rope.base.oi

diff --git a/ropetest/builtinstest.py b/ropetest/builtinstest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import builtins, libutils, pyobjects
 from ropetest import testutils

diff --git a/ropetest/codeanalyzetest.py b/ropetest/codeanalyzetest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.evaluate
 from rope.base import libutils

diff --git a/ropetest/contrib/__init__.py b/ropetest/contrib/__init__.py
@@ -1,9 +1,6 @@
 import sys
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import ropetest.contrib.autoimporttest
 import ropetest.contrib.changestacktest

diff --git a/ropetest/contrib/autoimporttest.py b/ropetest/contrib/autoimporttest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.contrib.autoimport import sqlite as autoimport
 from ropetest import testutils

diff --git a/ropetest/contrib/changestacktest.py b/ropetest/contrib/changestacktest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 import rope.base.history

diff --git a/ropetest/contrib/codeassisttest.py b/ropetest/contrib/codeassisttest.py
@@ -1,10 +1,7 @@
 import os.path
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from rope.contrib.codeassist import (

diff --git a/ropetest/contrib/finderrorstest.py b/ropetest/contrib/finderrorstest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from rope.contrib import finderrors

diff --git a/ropetest/contrib/findittest.py b/ropetest/contrib/findittest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from rope.contrib.findit import find_occurrences, find_implementations, find_definition

diff --git a/ropetest/contrib/fixmodnamestest.py b/ropetest/contrib/fixmodnamestest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from ropetest import testutils

diff --git a/ropetest/contrib/generatetest.py b/ropetest/contrib/generatetest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from rope.contrib import generate

diff --git a/ropetest/doatest.py b/ropetest/doatest.py
@@ -9,10 +9,7 @@
     import pickle
 import socket
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from rope.base.oi import doa

diff --git a/ropetest/historytest.py b/ropetest/historytest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.history
 from rope.base import exceptions

diff --git a/ropetest/objectdbtest.py b/ropetest/objectdbtest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from rope.base.oi import objectdb, memorydb

diff --git a/ropetest/objectinfertest.py b/ropetest/objectinfertest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.project
 import rope.base.builtins

diff --git a/ropetest/projecttest.py b/ropetest/projecttest.py
@@ -12,10 +12,7 @@
 from ropetest import testutils
 
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 class ProjectTest(unittest.TestCase):

diff --git a/ropetest/pycoretest.py b/ropetest/pycoretest.py
@@ -3,10 +3,7 @@
 
 from rope.base.builtins import File, BuiltinClass
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from rope.base import libutils

diff --git a/ropetest/pyscopestest.py b/ropetest/pyscopestest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from textwrap import dedent
 

diff --git a/ropetest/refactor/__init__.py b/ropetest/refactor/__init__.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.taskhandle
 import rope.refactor.introduce_parameter

diff --git a/ropetest/refactor/change_signature_test.py b/ropetest/refactor/change_signature_test.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.exceptions
 from rope.refactor import change_signature

diff --git a/ropetest/refactor/extracttest.py b/ropetest/refactor/extracttest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.codeanalyze
 import rope.base.exceptions

diff --git a/ropetest/refactor/importutilstest.py b/ropetest/refactor/importutilstest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from textwrap import dedent
 

diff --git a/ropetest/refactor/inlinetest.py b/ropetest/refactor/inlinetest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.exceptions
 from rope.refactor import inline

diff --git a/ropetest/refactor/movetest.py b/ropetest/refactor/movetest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from rope.refactor import move

diff --git a/ropetest/refactor/multiprojecttest.py b/ropetest/refactor/multiprojecttest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.refactor import multiproject, rename, move
 from ropetest import testutils

diff --git a/ropetest/refactor/patchedasttest.py b/ropetest/refactor/patchedasttest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 import sys
 from textwrap import dedent
 

diff --git a/ropetest/refactor/renametest.py b/ropetest/refactor/renametest.py
@@ -1,10 +1,7 @@
 import sys
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.codeanalyze
 import rope.refactor.occurrences

diff --git a/ropetest/refactor/restructuretest.py b/ropetest/refactor/restructuretest.py
@@ -3,10 +3,7 @@
 from rope.refactor import restructure
 from ropetest import testutils
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 class RestructureTest(unittest.TestCase):

diff --git a/ropetest/refactor/similarfindertest.py b/ropetest/refactor/similarfindertest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.refactor import similarfinder
 from ropetest import testutils

diff --git a/ropetest/refactor/suitestest.py b/ropetest/refactor/suitestest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import ast
 from rope.refactor import suites

diff --git a/ropetest/refactor/usefunctiontest.py b/ropetest/refactor/usefunctiontest.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import exceptions
 from ropetest import testutils

diff --git a/ropetest/runmodtest.py b/ropetest/runmodtest.py
@@ -1,10 +1,7 @@
 import os
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from rope.base import exceptions

diff --git a/ropetest/simplifytest.py b/ropetest/simplifytest.py
@@ -1,7 +1,4 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 from rope.base import simplify
 

diff --git a/ropetest/testutils.py b/ropetest/testutils.py
@@ -4,10 +4,7 @@
 import logging
 
 logging.basicConfig(format="%(levelname)s:%(funcName)s:%(message)s", level=logging.INFO)
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 import rope.base.project
 from rope.contrib import generate

diff --git a/ropetest/type_hinting_test.py b/ropetest/type_hinting_test.py
@@ -1,9 +1,6 @@
 from textwrap import dedent
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+import unittest
 
 
 from rope.contrib.codeassist import code_assist