Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions tests/integration/long/test_large_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

try:
from Queue import Queue, Empty
except ImportError:
from queue import Queue, Empty # noqa
from queue import Queue, Empty

from struct import pack
import logging, sys, traceback, time
Expand Down
12 changes: 3 additions & 9 deletions tests/integration/standard/test_shard_aware.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,9 @@
from subprocess import run
import logging

try:
from concurrent.futures import ThreadPoolExecutor, as_completed
except ImportError:
from futures import ThreadPoolExecutor, as_completed # noqa

try:
import unittest2 as unittest
except ImportError:
import unittest # noqa
from concurrent.futures import ThreadPoolExecutor, as_completed

import unittest
import pytest

from cassandra.cluster import Cluster
Expand Down
5 changes: 1 addition & 4 deletions tests/integration/standard/test_use_keyspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
import time
import logging

try:
import unittest2 as unittest
except ImportError:
import unittest # noqa
import unittest

from unittest.mock import patch

Expand Down
14 changes: 4 additions & 10 deletions tests/unit/io/eventlet_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,21 +16,15 @@
import os
import select
import socket
try:
import thread
import Queue
import __builtin__
#For python3 compatibility
except ImportError:
import _thread as thread
import queue as Queue
import builtins as __builtin__
import _thread as thread
import queue as Queue
import builtins as __builtin__

import threading
import ssl
import time
import eventlet
from imp import reload
from importlib import reload

def eventlet_un_patch_all():
"""
Expand Down
5 changes: 1 addition & 4 deletions tests/unit/test_protocol_features.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
try:
import unittest2 as unittest
except ImportError:
import unittest # noqa
import unittest

import logging

Expand Down
5 changes: 1 addition & 4 deletions tests/unit/test_shard_aware.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
from unittest.mock import MagicMock
Expand Down
Loading