Drop 'unittest2' dependency.

appveyor.yml

@@ -82,7 +82,7 @@ install:
   # compiled extensions and are not provided as pre-built wheel packages,
   # pip will build them from source using the MSVC compiler matching the
   # target Python version and architecture
-  - "%CMD_IN_ENV% pip install wheel nose nose-exclude unittest2 cryptography grpcio"
+  - "%CMD_IN_ENV% pip install wheel nose nose-exclude cryptography grpcio"
   # Install sometimes-problemaatic gRPC-related dependencies
   - "%CMD_IN_ENV% pip install grpcio gax-google-pubsub-v1 gax-google-logging-v2"
 

gcloud/bigquery/test__helpers.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class Test_ConfigurationProperty(unittest2.TestCase):
+class Test_ConfigurationProperty(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery._helpers import _ConfigurationProperty
@@ -50,7 +50,7 @@ def __init__(self):
         self.assertEqual(wrapper._configuration._attr, None)
 
 
-class Test_TypedProperty(unittest2.TestCase):
+class Test_TypedProperty(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery._helpers import _TypedProperty
@@ -83,7 +83,7 @@ def __init__(self):
         self.assertEqual(wrapper._configuration._attr, None)
 
 
-class Test_EnumProperty(unittest2.TestCase):
+class Test_EnumProperty(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery._helpers import _EnumProperty

gcloud/bigquery/test_client.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestClient(unittest2.TestCase):
+class TestClient(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery.client import Client

gcloud/bigquery/test_connection.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestConnection(unittest2.TestCase):
+class TestConnection(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery.connection import Connection

gcloud/bigquery/test_dataset.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestAccessGrant(unittest2.TestCase):
+class TestAccessGrant(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery.dataset import AccessGrant
@@ -76,7 +76,7 @@ def test___eq___hit(self):
         self.assertEqual(grant, other)
 
 
-class TestDataset(unittest2.TestCase):
+class TestDataset(unittest.TestCase):
     PROJECT = 'project'
     DS_NAME = 'dataset-name'
 

gcloud/bigquery/test_job.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class Test_UDFResourcesProperty(unittest2.TestCase):
+class Test_UDFResourcesProperty(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery.job import UDFResourcesProperty
@@ -189,7 +189,7 @@ def _verifyReadonlyResourceProperties(self, job, resource):
             self.assertEqual(job.user_email, None)
 
 
-class TestLoadTableFromStorageJob(unittest2.TestCase, _Base):
+class TestLoadTableFromStorageJob(unittest.TestCase, _Base):
     JOB_TYPE = 'load'
 
     def _getTargetClass(self):
@@ -695,7 +695,7 @@ def test_cancel_w_alternate_client(self):
         self._verifyResourceProperties(job, RESOURCE)
 
 
-class TestCopyJob(unittest2.TestCase, _Base):
+class TestCopyJob(unittest.TestCase, _Base):
     JOB_TYPE = 'copy'
     SOURCE_TABLE = 'source_table'
     DESTINATION_TABLE = 'destination_table'
@@ -992,7 +992,7 @@ def test_reload_w_alternate_client(self):
         self._verifyResourceProperties(job, RESOURCE)
 
 
-class TestExtractTableToStorageJob(unittest2.TestCase, _Base):
+class TestExtractTableToStorageJob(unittest.TestCase, _Base):
     JOB_TYPE = 'extract'
     SOURCE_TABLE = 'source_table'
     DESTINATION_URI = 'gs://bucket_name/object_name'
@@ -1285,7 +1285,7 @@ def test_reload_w_alternate_client(self):
         self._verifyResourceProperties(job, RESOURCE)
 
 
-class TestQueryJob(unittest2.TestCase, _Base):
+class TestQueryJob(unittest.TestCase, _Base):
     JOB_TYPE = 'query'
     QUERY = 'select count(*) from persons'
     DESTINATION_TABLE = 'destination_table'

gcloud/bigquery/test_query.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestQueryResults(unittest2.TestCase):
+class TestQueryResults(unittest.TestCase):
     PROJECT = 'project'
     JOB_NAME = 'job_name'
     JOB_NAME = 'test-synchronous-query'

gcloud/bigquery/test_table.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class TestSchemaField(unittest2.TestCase):
+class TestSchemaField(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigquery.table import SchemaField
@@ -125,7 +125,7 @@ def _verifySchema(self, schema, resource):
             self._verify_field(field, r_field)
 
 
-class TestTable(unittest2.TestCase, _SchemaBase):
+class TestTable(unittest.TestCase, _SchemaBase):
     PROJECT = 'project'
     DS_NAME = 'dataset-name'
     TABLE_NAME = 'table-name'
@@ -1552,7 +1552,7 @@ class _UploadConfig(object):
     # pylint: enable=too-many-statements
 
 
-class Test_parse_schema_resource(unittest2.TestCase, _SchemaBase):
+class Test_parse_schema_resource(unittest.TestCase, _SchemaBase):
 
     def _callFUT(self, resource):
         from gcloud.bigquery.table import _parse_schema_resource
@@ -1596,7 +1596,7 @@ def test__parse_schema_resource_fields_without_mode(self):
         self._verifySchema(schema, RESOURCE)
 
 
-class Test_build_schema_resource(unittest2.TestCase, _SchemaBase):
+class Test_build_schema_resource(unittest.TestCase, _SchemaBase):
 
     def _callFUT(self, resource):
         from gcloud.bigquery.table import _build_schema_resource

gcloud/bigtable/happybase/test_batch.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-import unittest2
+import unittest
 
 
 class _SendMixin(object):
@@ -24,7 +24,7 @@ def send(self):
         self._send_called = True
 
 
-class TestBatch(unittest2.TestCase):
+class TestBatch(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigtable.happybase.batch import Batch
@@ -474,7 +474,7 @@ class BatchWithSend(_SendMixin, klass):
         self.assertTrue(batch._send_called)
 
 
-class Test__get_column_pairs(unittest2.TestCase):
+class Test__get_column_pairs(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.batch import _get_column_pairs

gcloud/bigtable/happybase/test_connection.py

@@ -15,10 +15,10 @@
 
 import sys
 
-import unittest2
+import unittest
 
 
-class Test__get_instance(unittest2.TestCase):
+class Test__get_instance(unittest.TestCase):
 
     def _callFUT(self, timeout=None):
         from gcloud.bigtable.happybase.connection import _get_instance
@@ -72,7 +72,7 @@ def test_with_failed_locations(self):
                          failed_locations=[failed_location])
 
 
-class TestConnection(unittest2.TestCase):
+class TestConnection(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigtable.happybase.connection import Connection
@@ -418,8 +418,8 @@ def make_table(*args, **kwargs):
         self.assertEqual(len(tables_created), 1)
         self.assertEqual(tables_created[0].create_calls, 1)
 
-    @unittest2.skipUnless(sys.version_info[:2] == (2, 7),
-                          'gRPC only in Python 2.7')
+    @unittest.skipUnless(sys.version_info[:2] == (2, 7),
+                         'gRPC only in Python 2.7')
     def test_create_table_already_exists(self):
         from grpc.beta import interfaces
         from grpc.framework.interfaces.face import face
@@ -429,17 +429,17 @@ def test_create_table_already_exists(self):
                                     interfaces.StatusCode.ALREADY_EXISTS, None)
         self._create_table_error_helper(err_val, AlreadyExists)
 
-    @unittest2.skipUnless(sys.version_info[:2] == (2, 7),
-                          'gRPC only in Python 2.7')
+    @unittest.skipUnless(sys.version_info[:2] == (2, 7),
+                         'gRPC only in Python 2.7')
     def test_create_table_connection_error(self):
         from grpc.beta import interfaces
         from grpc.framework.interfaces.face import face
         err_val = face.NetworkError(None, None,
                                     interfaces.StatusCode.INTERNAL, None)
         self._create_table_error_helper(err_val, face.NetworkError)
 
-    @unittest2.skipUnless(sys.version_info[:2] == (2, 7),
-                          'gRPC only in Python 2.7')
+    @unittest.skipUnless(sys.version_info[:2] == (2, 7),
+                         'gRPC only in Python 2.7')
     def test_create_table_other_error(self):
         self._create_table_error_helper(RuntimeError, RuntimeError)
 
@@ -562,7 +562,7 @@ def mock_warn(msg):
         self.assertEqual(warned, [MUT._COMPACT_TMPL % (name, False)])
 
 
-class Test__parse_family_option(unittest2.TestCase):
+class Test__parse_family_option(unittest.TestCase):
 
     def _callFUT(self, option):
         from gcloud.bigtable.happybase.connection import _parse_family_option

gcloud/bigtable/happybase/test_pool.py

@@ -13,10 +13,10 @@
 # limitations under the License.
 
 
-import unittest2
+import unittest
 
 
-class TestConnectionPool(unittest2.TestCase):
+class TestConnectionPool(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigtable.happybase.pool import ConnectionPool

gcloud/bigtable/happybase/test_table.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import unittest2
+import unittest
 
 
-class Test_make_row(unittest2.TestCase):
+class Test_make_row(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import make_row
@@ -26,7 +26,7 @@ def test_it(self):
             self._callFUT({}, False)
 
 
-class Test_make_ordered_row(unittest2.TestCase):
+class Test_make_ordered_row(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import make_ordered_row
@@ -37,7 +37,7 @@ def test_it(self):
             self._callFUT([], False)
 
 
-class TestTable(unittest2.TestCase):
+class TestTable(unittest.TestCase):
 
     def _getTargetClass(self):
         from gcloud.bigtable.happybase.table import Table
@@ -1013,7 +1013,7 @@ def test_counter_inc_result_non_unique_cell(self):
             self._counter_inc_helper(row, column, value, commit_result)
 
 
-class Test__gc_rule_to_dict(unittest2.TestCase):
+class Test__gc_rule_to_dict(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _gc_rule_to_dict
@@ -1102,7 +1102,7 @@ def test_with_intersection_two_nested_rules(self):
         self.assertTrue(result is gc_rule)
 
 
-class Test__string_successor(unittest2.TestCase):
+class Test__string_successor(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _string_successor
@@ -1125,7 +1125,7 @@ def test_with_unicode_input(self):
         self.assertEqual(self._callFUT(u'boa'), b'bob')
 
 
-class Test__convert_to_time_range(unittest2.TestCase):
+class Test__convert_to_time_range(unittest.TestCase):
 
     def _callFUT(self, timestamp=None):
         from gcloud.bigtable.happybase.table import _convert_to_time_range
@@ -1153,7 +1153,7 @@ def test_success(self):
         self.assertEqual(result.end, ts_dt)
 
 
-class Test__cells_to_pairs(unittest2.TestCase):
+class Test__cells_to_pairs(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _cells_to_pairs
@@ -1189,7 +1189,7 @@ def test_with_timestamp(self):
                          [(value1, ts1_millis), (value2, ts2_millis)])
 
 
-class Test__partial_row_to_dict(unittest2.TestCase):
+class Test__partial_row_to_dict(unittest.TestCase):
 
     def _callFUT(self, partial_row_data, include_timestamp=False):
         from gcloud.bigtable.happybase.table import _partial_row_to_dict
@@ -1238,7 +1238,7 @@ def test_with_timestamp(self):
         self.assertEqual(result, expected_result)
 
 
-class Test__filter_chain_helper(unittest2.TestCase):
+class Test__filter_chain_helper(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _filter_chain_helper
@@ -1348,7 +1348,7 @@ def test_with_all_options(self):
                             timestamp=timestamp)
 
 
-class Test__columns_filter_helper(unittest2.TestCase):
+class Test__columns_filter_helper(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _columns_filter_helper
@@ -1396,7 +1396,7 @@ def test_column_and_column_families(self):
         self.assertEqual(filter2b.regex, col_qual2.encode('utf-8'))
 
 
-class Test__row_keys_filter_helper(unittest2.TestCase):
+class Test__row_keys_filter_helper(unittest.TestCase):
 
     def _callFUT(self, *args, **kwargs):
         from gcloud.bigtable.happybase.table import _row_keys_filter_helper