bulk isort

assertions.py

@@ -4,6 +4,7 @@
                        ReadTimeout, Unauthorized, Unavailable, WriteFailure,
                        WriteTimeout)
 from cassandra.query import SimpleStatement
+
 from tools import rows_to_list
 
 

batch_test.py

@@ -1,11 +1,11 @@
+import sys
 import time
+from unittest import skipIf
 
 from cassandra import ConsistencyLevel, Timeout, Unavailable
 from cassandra.query import SimpleStatement
-import sys
 
-from assertions import assert_invalid, assert_unavailable, assert_one
-from unittest import skipIf
+from assertions import assert_invalid, assert_one, assert_unavailable
 from dtest import CASSANDRA_DIR, Tester, debug
 from tools import since
 

bin/collect_known_failures.py

@@ -11,10 +11,10 @@
 `nosetests`.
 """
 
-from functools import partial
 import json
 import os
 import sys
+from functools import partial
 
 import nose
 

bootstrap_test.py

@@ -6,10 +6,11 @@
 import tempfile
 import time
 
-from assertions import assert_almost_equal, assert_one
 from cassandra import ConsistencyLevel
 from cassandra.concurrent import execute_concurrent_with_args
 from ccmlib.node import NodeError
+
+from assertions import assert_almost_equal, assert_one
 from dtest import Tester, debug
 from tools import (InterruptBootstrap, KillOnBootstrap, known_failure,
                    new_node, query_c1c2, since)

cfid_test.py

@@ -1,6 +1,7 @@
-from dtest import Tester
 import os
 
+from dtest import Tester
+
 
 class TestCFID(Tester):
 

commitlog_test.py

@@ -6,11 +6,12 @@
 import subprocess
 import time
 
-from assertions import assert_almost_equal, assert_none, assert_one
 from cassandra import WriteTimeout
 from cassandra.cluster import NoHostAvailable, OperationTimedOut
 from ccmlib.common import is_win
 from ccmlib.node import Node, TimeoutError
+
+from assertions import assert_almost_equal, assert_none, assert_one
 from dtest import Tester, debug
 from tools import known_failure, rows_to_list, since
 

compression_test.py

@@ -1,8 +1,8 @@
 import os
 
+from assertions import assert_crc_check_chance_equal
 from scrub_test import TestHelper
 from tools import since
-from assertions import assert_crc_check_chance_equal
 
 
 class TestCompression(TestHelper):

concurrent_schema_changes_test.py

@@ -7,8 +7,8 @@
 from threading import Thread
 
 from cassandra.concurrent import execute_concurrent
-
 from ccmlib.node import Node
+
 from dtest import Tester, debug
 from tools import known_failure, require, since
 

consistency_test.py

@@ -6,9 +6,10 @@
 from collections import OrderedDict
 from copy import deepcopy
 
-from assertions import assert_none, assert_unavailable
 from cassandra import ConsistencyLevel
 from cassandra.query import SimpleStatement
+
+from assertions import assert_none, assert_unavailable
 from dtest import DISABLE_VNODES, Tester, debug
 from tools import (create_c1c2_table, insert_c1c2, insert_columns,
                    known_failure, query_c1c2, rows_to_list, since)

counter_tests.py

@@ -2,9 +2,10 @@
 import time
 import uuid
 
-from assertions import assert_invalid, assert_one
 from cassandra import ConsistencyLevel
 from cassandra.query import SimpleStatement
+
+from assertions import assert_invalid, assert_one
 from dtest import Tester
 from tools import rows_to_list, since
 

cql_prepared_test.py

@@ -1,8 +1,8 @@
+import time
+
 from dtest import Tester
 from tools import since
 
-import time
-
 
 @since("1.2")
 class TestCQL(Tester):

cqlsh_tests/cqlsh_copy_tests.py

@@ -1,29 +1,30 @@
 # coding: utf-8
 import csv
 import datetime
-import json
 import glob
+import json
 import os
 import sys
 import time
 from collections import namedtuple
 from contextlib import contextmanager
-from functools import partial
 from decimal import Decimal
-from dtest import warning
+from functools import partial
 from tempfile import NamedTemporaryFile, gettempdir, template
 from uuid import uuid1, uuid4
 
-from cassandra.murmur3 import murmur3
 from cassandra.cluster import ConsistencyLevel, SimpleStatement
 from cassandra.concurrent import execute_concurrent_with_args
+from cassandra.murmur3 import murmur3
 from cassandra.util import SortedSet
 from ccmlib.common import is_win
 
 from cqlsh_tools import (DummyColorMap, assert_csvs_items_equal, csv_rows,
-                         monkeypatch_driver, random_list, unmonkeypatch_driver, write_rows_to_csv)
-from dtest import Tester, canReuseCluster, freshCluster, debug, DISABLE_VNODES
-from tools import rows_to_list, since, known_failure
+                         monkeypatch_driver, random_list, unmonkeypatch_driver,
+                         write_rows_to_csv)
+from dtest import (DISABLE_VNODES, Tester, canReuseCluster, debug,
+                   freshCluster, warning)
+from tools import known_failure, rows_to_list, since
 
 PARTITIONERS = {
     "murmur3": "org.apache.cassandra.dht.Murmur3Partitioner",

cqlsh_tests/cqlsh_tests.py

@@ -15,9 +15,9 @@
 from cassandra import InvalidRequest
 from cassandra.concurrent import execute_concurrent_with_args
 from cassandra.query import BatchStatement, BatchType
+from ccmlib import common
 
 from assertions import assert_all, assert_none
-from ccmlib import common
 from cqlsh_tools import monkeypatch_driver, unmonkeypatch_driver
 from dtest import Tester, debug
 from tools import create_c1c2_table, insert_c1c2, rows_to_list, since

datahelp.py

@@ -1,4 +1,5 @@
 import re
+
 from cassandra.concurrent import execute_concurrent_with_args
 
 

dtest.py

@@ -20,9 +20,6 @@
 from collections import OrderedDict
 from unittest import TestCase
 
-from nose.exc import SkipTest
-from six import print_
-
 from cassandra import ConsistencyLevel
 from cassandra.auth import PlainTextAuthProvider
 from cassandra.cluster import Cluster as PyCluster
@@ -32,10 +29,12 @@
 from ccmlib.cluster_factory import ClusterFactory
 from ccmlib.common import is_win
 from ccmlib.node import TimeoutError
+from nose.exc import SkipTest
+from six import print_
 
+from plugins.dtestconfig import _CONFIG as CONFIG
 # We don't want test files to know about the plugins module, so we import
 # constants here and re-export them.
-from plugins.dtestconfig import _CONFIG as CONFIG
 from plugins.dtestconfig import GlobalConfigObject
 
 LOG_SAVED_DIR = "logs"

global_row_key_cache_test.py

@@ -1,10 +1,10 @@
 import time
 
+from cassandra.concurrent import execute_concurrent_with_args
+
 from dtest import Tester, debug
 from tools import known_failure
 
-from cassandra.concurrent import execute_concurrent_with_args
-
 
 class TestGlobalRowKeyCache(Tester):
 

hintedhandoff_test.py

@@ -1,10 +1,10 @@
 import os
+import time
 
 from cassandra import ConsistencyLevel
 
 from dtest import DISABLE_VNODES, Tester
-from tools import create_c1c2_table, insert_c1c2, query_c1c2, since, no_vnodes
-import time
+from tools import create_c1c2_table, insert_c1c2, no_vnodes, query_c1c2, since
 
 
 @since('3.0')

jmx_test.py

@@ -5,6 +5,7 @@
 
 import ccmlib.common
 from ccmlib.node import NodetoolError
+
 from dtest import Tester, debug
 from jmxutils import JolokiaAgent, make_mbean, remove_perf_disable_shared_mem
 from tools import known_failure, since

jmxmetrics_test.py

@@ -1,6 +1,6 @@
 from dtest import Tester
-from tools import debug, known_failure, require
 from jmxutils import JolokiaAgent, make_mbean, remove_perf_disable_shared_mem
+from tools import debug, known_failure, require
 
 
 # We currently only have attributes that are incrementing.

jmxutils.py

@@ -1,8 +1,10 @@
-import ccmlib.common as common
-from urllib2 import urlopen
 import json
 import os
 import subprocess
+from urllib2 import urlopen
+
+import ccmlib.common as common
+
 from dtest import warning
 
 JOLOKIA_JAR = os.path.join('lib', 'jolokia-jvm-1.2.3-agent.jar')

json_test.py

@@ -5,8 +5,10 @@
 import subprocess
 import sys
 from distutils.version import LooseVersion
+
 from ccmlib import common
 from ccmlib.common import is_win
+
 from dtest import Tester
 from tools import since
 

materialized_views_test.py

@@ -7,15 +7,15 @@
 from multiprocessing import Process, Queue
 from unittest import skipIf
 
+from cassandra import ConsistencyLevel
+from cassandra.cluster import Cluster
+from cassandra.query import SimpleStatement
 # TODO add in requirements.txt
 from enum import Enum  # Remove when switching to py3
 
 from assertions import (assert_all, assert_crc_check_chance_equal,
                         assert_invalid, assert_none, assert_one,
                         assert_unavailable)
-from cassandra import ConsistencyLevel
-from cassandra.cluster import Cluster
-from cassandra.query import SimpleStatement
 from dtest import Tester, debug
 from tools import known_failure, new_node, since
 

metadata_tests.py

@@ -1,5 +1,5 @@
-import time
 import threading
+import time
 from unittest import skip
 
 from dtest import Tester

mixed_version_test.py

@@ -1,8 +1,8 @@
-from cassandra import ConsistencyLevel, ReadTimeout, OperationTimedOut
+from cassandra import ConsistencyLevel, OperationTimedOut, ReadTimeout
 from cassandra.query import SimpleStatement
 
-from tools import since
 from dtest import Tester, debug
+from tools import since
 
 
 class TestSchemaChanges(Tester):

nodetool_test.py

@@ -1,9 +1,10 @@
+import os
+
 from ccmlib.node import NodetoolError
+
 from dtest import Tester, debug
 from tools import since
 
-import os
-
 
 class TestNodetool(Tester):
 

offline_tools_test.py

@@ -1,10 +1,11 @@
+import json
 import os
 import random
 import re
 import subprocess
-import json
 
 from ccmlib import common
+
 from dtest import Tester, debug
 from tools import known_failure, since
 

paging_test.py

@@ -1,11 +1,12 @@
 import time
 import uuid
 
-from assertions import assert_invalid
 from cassandra import ConsistencyLevel as CL
 from cassandra import InvalidRequest, ReadFailure, ReadTimeout
 from cassandra.policies import FallthroughRetryPolicy
-from cassandra.query import SimpleStatement, dict_factory, named_tuple_factory, tuple_factory
+from cassandra.query import (SimpleStatement, dict_factory,
+                             named_tuple_factory, tuple_factory)
+
 from assertions import assert_invalid
 from datahelp import create_rows, flatten_into_set, parse_data_into_dicts
 from dtest import Tester, run_scenarios

paxos_tests.py

@@ -3,9 +3,10 @@
 import time
 from threading import Thread
 
-from assertions import assert_unavailable
 from cassandra import ConsistencyLevel, WriteTimeout
 from cassandra.query import SimpleStatement
+
+from assertions import assert_unavailable
 from dtest import Tester
 from tools import no_vnodes, since
 

pending_range_test.py

@@ -1,4 +1,5 @@
 from cassandra.query import SimpleStatement
+
 from dtest import TRACE, Tester, debug
 from tools import no_vnodes
 

prepared_statements_test.py

@@ -1,6 +1,7 @@
-from dtest import Tester
 from cassandra import InvalidRequest
 
+from dtest import Tester
+
 KEYSPACE = "foo"
 
 

pushed_notifications_test.py

@@ -1,12 +1,12 @@
 import time
 from threading import Event
 
-from nose.tools import timed
-
-from assertions import assert_invalid
 from cassandra import ConsistencyLevel as CL
 from cassandra import ReadFailure
 from cassandra.query import SimpleStatement
+from nose.tools import timed
+
+from assertions import assert_invalid
 from dtest import Tester, debug
 from tools import known_failure, no_vnodes, since