Install unittest2 as a test dependencies when running tests under Python 2.6.

Currently tests would blow up if they were run under 2.6 because they were
relying on unittest functionality which is only available in Pyton >= 2.7.

Conflicts:

	tox.ini

tests/integration/test_cluster.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from cassandra.cluster import Cluster, NoHostAvailable
 

tests/integration/test_connection.py

@@ -1,4 +1,8 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from functools import partial
 from threading import Thread, Event
 

tests/integration/test_metadata.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from cassandra.cluster import Cluster
 from cassandra.metadata import TableMetadata, Token, MD5Token, TokenMap

tests/integration/test_prepared_statements.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from cassandra.cluster import Cluster
 from cassandra.query import PreparedStatement

tests/integration/test_types.py

@@ -1,7 +1,11 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from decimal import Decimal
 from datetime import datetime
 from uuid import uuid1, uuid4
-import unittest
 
 from cassandra.cluster import Cluster
 

tests/unit/io/test_libevreactor.py

@@ -1,7 +1,11 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 import errno
 from StringIO import StringIO
 from socket import error as socket_error
-import unittest
 
 from mock import patch, Mock
 

tests/unit/test_connection.py

@@ -1,5 +1,9 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from StringIO import StringIO
-import unittest
 
 from mock import Mock, ANY
 

tests/unit/test_control_connection.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from mock import Mock, ANY
 

tests/unit/test_host_connection_pool.py

@@ -1,6 +1,10 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from mock import Mock, NonCallableMagicMock
 from threading import Thread, Event
-import unittest
 
 from cassandra.cluster import Session
 from cassandra.connection import Connection, MAX_STREAM_PER_CONNECTION

tests/unit/test_marshalling.py

@@ -1,4 +1,8 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from datetime import datetime
 from decimal import Decimal
 from uuid import UUID

tests/unit/test_parameter_binding.py

@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from cassandra.query import bind_params, ValueSequence
 from cassandra.query import PreparedStatement, BoundStatement

tests/unit/test_policies.py

@@ -1,8 +1,12 @@
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from itertools import islice, cycle
 from mock import Mock
 import struct
 from threading import Thread
-import unittest
 
 from cassandra import ConsistencyLevel
 from cassandra.cluster import Cluster

tests/unit/test_response_future.py

@@ -1,4 +1,8 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from mock import Mock, MagicMock, ANY
 
 from cassandra import ConsistencyLevel