PYTHON-1289: remove unittest2

test-requirements.txt

@@ -3,7 +3,6 @@ scales
 nose
 mock>1.1
 ccm>=2.1.2
-unittest2
 pytz
 sure
 pure-sasl

tests/__init__.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 import logging
 import sys
 import socket

tests/integration/__init__.py

@@ -18,10 +18,7 @@
 from tests import connection_class, EVENT_LOOP_MANAGER
 Cluster.connection_class = connection_class
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from packaging.version import Version
 import logging

tests/integration/advanced/__init__.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from six.moves.urllib.request import build_opener, Request, HTTPHandler
 import re

tests/integration/advanced/graph/fluent/__init__.py

@@ -35,10 +35,7 @@
     VertexLabel)
 from tests.integration import requiredse
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 
 import ipaddress

tests/integration/advanced/graph/fluent/test_graph.py

@@ -28,10 +28,7 @@
 from tests.integration.advanced.graph.fluent import (
     BaseExplicitExecutionTest, create_traversal_profiles, check_equality_base)
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 
 @greaterthanorequaldse60

tests/integration/advanced/graph/test_graph_datatype.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import time
 import six

tests/integration/advanced/graph/test_graph_query.py

@@ -22,10 +22,7 @@
 import json
 import time
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from cassandra import OperationTimedOut, ConsistencyLevel, InvalidRequest
 from cassandra.cluster import EXEC_PROFILE_GRAPH_DEFAULT, NoHostAvailable

tests/integration/advanced/test_adv_metadata.py

@@ -20,10 +20,7 @@
                                greaterthanorequaldse68, use_single_node,
                                DSE_VERSION, requiredse, TestCluster)
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import logging
 import time

tests/integration/advanced/test_auth.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 import logging
 import os
 import subprocess

tests/integration/advanced/test_cont_paging.py

@@ -18,10 +18,7 @@
 import logging
 log = logging.getLogger(__name__)
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from itertools import cycle, count
 from six.moves import range

tests/integration/advanced/test_cqlengine_where_operators.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import os
 import time

tests/integration/advanced/test_geometry.py

@@ -18,10 +18,7 @@
 from cassandra.util import OrderedMap, sortedset
 from collections import namedtuple
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 from uuid import uuid1
 from cassandra.util import Point, LineString, Polygon
 from cassandra.cqltypes import LineStringType, PointType, PolygonType

tests/integration/advanced/test_unixsocketendpoint.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import time
 import subprocess

tests/integration/cloud/__init__.py

@@ -13,10 +13,7 @@
 # limitations under the License
 from cassandra.cluster import Cluster
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import os
 import subprocess

tests/integration/cloud/test_cloud.py

@@ -18,10 +18,7 @@
 from cassandra.cqlengine.models import Model
 from cassandra.cqlengine import columns
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import six
 from ssl import SSLContext, PROTOCOL_TLS

tests/integration/cqlengine/__init__.py

@@ -14,10 +14,7 @@
 
 import os
 import warnings
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 from cassandra import ConsistencyLevel
 
 from cassandra.cqlengine import connection

tests/integration/cqlengine/advanced/test_cont_paging.py

@@ -14,10 +14,7 @@
 
 
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from packaging.version import Version
 

tests/integration/cqlengine/base.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import sys
 

tests/integration/cqlengine/columns/test_static_column.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from uuid import uuid4
 

tests/integration/cqlengine/columns/test_validation.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import sys
 from datetime import datetime, timedelta, date, tzinfo, time

tests/integration/cqlengine/columns/test_value_io.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from datetime import datetime, timedelta, time
 from decimal import Decimal

tests/integration/cqlengine/connections/test_connection.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 
 from cassandra import ConsistencyLevel

tests/integration/cqlengine/management/test_management.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import mock
 import logging

tests/integration/cqlengine/model/test_model.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from mock import patch
 

tests/integration/cqlengine/model/test_model_io.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from uuid import uuid4, UUID
 import random

tests/integration/cqlengine/model/test_udts.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from datetime import datetime, date, time
 from decimal import Decimal

tests/integration/cqlengine/operators/test_where_operators.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from cassandra.cqlengine.operators import *
 

tests/integration/cqlengine/query/test_named.py

@@ -12,10 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from cassandra import ConsistencyLevel
 from cassandra.cqlengine import operators

tests/integration/cqlengine/query/test_queryset.py

@@ -13,10 +13,7 @@
 # limitations under the License.
 from __future__ import absolute_import
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from datetime import datetime
 from uuid import uuid4

tests/integration/cqlengine/statements/test_assignment_clauses.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from cassandra.cqlengine.statements import AssignmentClause, SetUpdateClause, ListUpdateClause, MapUpdateClause, MapDeleteClause, FieldDeleteClause, CounterUpdateClause
 

tests/integration/cqlengine/statements/test_base_statement.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 from uuid import uuid4
 import six

tests/integration/cqlengine/statements/test_insert_statement.py

@@ -11,10 +11,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest  # noqa
+import unittest
 
 import six