Upgrading for Pylint and syncing with gcloud-python.

gcloud_bigtable/_helpers.py

@@ -95,41 +95,6 @@ def _pb_timestamp_to_datetime(timestamp):
     )
 
 
-def _require_pb_property(message_pb, property_name, value):
-    """Check that a property agrees with the value on the message.
-
-    :type message_pb: :class:`google.protobuf.message.Message`
-    :param message_pb: The message to check for ``property_name``.
-
-    :type property_name: str
-    :param property_name: The property value to check against.
-
-    :type value: object or :data:`NoneType <types.NoneType>`
-    :param value: The value to check against the cluster. If :data:`None`,
-                  will not be checked.
-
-    :rtype: object
-    :returns: The value of ``property_name`` set on ``message_pb``.
-    :raises: :class:`ValueError <exceptions.ValueError>` if the result returned
-             from the ``message_pb`` does not contain the ``property_name``
-             value or if the value returned disagrees with the ``value``
-             passed with the request (if that value is not null).
-    """
-    # Make sure `property_name` is set on the response.
-    # NOTE: HasField() doesn't work in protobuf>=3.0.0a3
-    all_fields = set([field.name for field in message_pb._fields])
-    if property_name not in all_fields:
-        raise ValueError('Message does not contain %s.' % (property_name,))
-    property_val = getattr(message_pb, property_name)
-    if value is None:
-        value = property_val
-    elif value != property_val:
-        raise ValueError('Message returned %s value disagreeing '
-                         'with value passed in.' % (property_name,))
-
-    return value
-
-
 def _parse_pb_any_to_native(any_val, expected_type=None):
     """Convert a serialized "google.protobuf.Any" value to actual type.
 

gcloud_bigtable/client.py

@@ -29,9 +29,10 @@
 
 import copy
 import os
-import six
 import socket
 
+import six
+
 from oauth2client.client import GoogleCredentials
 from oauth2client.client import SignedJwtAssertionCredentials
 from oauth2client.client import _get_application_default_credential_from_file
@@ -330,7 +331,8 @@ def from_service_account_p12(cls, client_email, private_key_path,
         """
         credentials = SignedJwtAssertionCredentials(
             service_account_name=client_email,
-            private_key=_get_contents(private_key_path))
+            private_key=_get_contents(private_key_path),
+            scope=None)
         return cls(credentials=credentials, project=project,
                    read_only=read_only, admin=admin)
 

gcloud_bigtable/cluster.py

@@ -25,7 +25,6 @@
 from gcloud_bigtable._generated import operations_pb2
 from gcloud_bigtable._helpers import _parse_pb_any_to_native
 from gcloud_bigtable._helpers import _pb_timestamp_to_datetime
-from gcloud_bigtable._helpers import _require_pb_property
 from gcloud_bigtable.table import Table
 
 
@@ -37,6 +36,30 @@
                                 r'(?P<operation_id>\d+)$')
 
 
+def _get_pb_property_value(message_pb, property_name):
+    """Return a message field value.
+
+    :type message_pb: :class:`google.protobuf.message.Message`
+    :param message_pb: The message to check for ``property_name``.
+
+    :type property_name: str
+    :param property_name: The property value to check against.
+
+    :rtype: object
+    :returns: The value of ``property_name`` set on ``message_pb``.
+    :raises: :class:`ValueError <exceptions.ValueError>` if the result returned
+             from the ``message_pb`` does not contain the ``property_name``
+             value.
+    """
+    # Make sure `property_name` is set on the response.
+    # NOTE: As of proto3, HasField() only works for message fields, not for
+    #       singular (non-message) fields.
+    all_fields = set([field.name for field in message_pb._fields])
+    if property_name not in all_fields:
+        raise ValueError('Message does not contain %s.' % (property_name,))
+    return getattr(message_pb, property_name)
+
+
 def _prepare_create_request(cluster):
     """Creates a protobuf request for a CreateCluster request.
 
@@ -136,10 +159,8 @@ def __init__(self, zone, cluster_id, client,
         self._operation_begin = None
 
     def _update_from_pb(self, cluster_pb):
-        self.display_name = _require_pb_property(
-            cluster_pb, 'display_name', None)
-        self.serve_nodes = _require_pb_property(
-            cluster_pb, 'serve_nodes', None)
+        self.display_name = _get_pb_property_value(cluster_pb, 'display_name')
+        self.serve_nodes = _get_pb_property_value(cluster_pb, 'serve_nodes')
 
     @classmethod
     def from_pb(cls, cluster_pb, client):

gcloud_bigtable/happybase/connection.py

@@ -102,10 +102,12 @@ def _parse_family_option(option):
     """
     result = option
     if isinstance(result, dict):
+        # pylint: disable=unneeded-not
         if not set(result.keys()) <= set(['max_versions', 'time_to_live']):
             raise ValueError('Cloud Bigtable only supports max_versions and '
                              'time_to_live column family settings',
                              'Received', result.keys())
+        # pylint: enable=unneeded-not
 
         max_num_versions = result.get('max_versions')
         max_age = None

gcloud_bigtable/happybase/pool.py

@@ -16,9 +16,10 @@
 
 
 import contextlib
-import six
 import threading
 
+import six
+
 from gcloud_bigtable.happybase.connection import Connection
 from gcloud_bigtable.happybase.connection import _get_cluster
 

gcloud_bigtable/happybase/table.py

@@ -15,9 +15,10 @@
 """Google Cloud Bigtable HappyBase table module."""
 
 
-import six
 import struct
 
+import six
+
 from gcloud_bigtable._helpers import _microseconds_to_timestamp
 from gcloud_bigtable._helpers import _timestamp_to_microseconds
 from gcloud_bigtable._helpers import _to_bytes

gcloud_bigtable/row.py

@@ -15,9 +15,10 @@
 """User friendly container for Google Cloud Bigtable Row."""
 
 
-import six
 import struct
 
+import six
+
 from gcloud_bigtable._generated import bigtable_data_pb2 as data_pb2
 from gcloud_bigtable._generated import (
     bigtable_service_messages_pb2 as messages_pb2)

gcloud_bigtable/test__helpers.py

@@ -94,48 +94,6 @@ def test_it(self):
         self.assertEqual(self._callFUT(timestamp), dt_stamp)
 
 
-class Test__require_pb_property(unittest2.TestCase):
-
-    def _callFUT(self, message_pb, property_name, value):
-        from gcloud_bigtable._helpers import _require_pb_property
-        return _require_pb_property(message_pb, property_name, value)
-
-    def test_it(self):
-        from gcloud_bigtable._generated import (
-            bigtable_cluster_data_pb2 as data_pb2)
-        serve_nodes = 119
-        cluster_pb = data_pb2.Cluster(serve_nodes=serve_nodes)
-        result = self._callFUT(cluster_pb, 'serve_nodes', serve_nodes)
-        self.assertEqual(result, serve_nodes)
-
-    def test_with_null_value_passed_in(self):
-        from gcloud_bigtable._generated import (
-            bigtable_cluster_data_pb2 as data_pb2)
-        serve_nodes = None
-        actual_serve_nodes = 119
-        cluster_pb = data_pb2.Cluster(serve_nodes=actual_serve_nodes)
-        result = self._callFUT(cluster_pb, 'serve_nodes', serve_nodes)
-        self.assertEqual(result, actual_serve_nodes)
-
-    def test_with_value_unset_on_pb(self):
-        from gcloud_bigtable._generated import (
-            bigtable_cluster_data_pb2 as data_pb2)
-        serve_nodes = 119
-        cluster_pb = data_pb2.Cluster()
-        with self.assertRaises(ValueError):
-            self._callFUT(cluster_pb, 'serve_nodes', serve_nodes)
-
-    def test_with_values_disagreeing(self):
-        from gcloud_bigtable._generated import (
-            bigtable_cluster_data_pb2 as data_pb2)
-        serve_nodes = 119
-        other_serve_nodes = 1000
-        self.assertNotEqual(serve_nodes, other_serve_nodes)
-        cluster_pb = data_pb2.Cluster(serve_nodes=other_serve_nodes)
-        with self.assertRaises(ValueError):
-            self._callFUT(cluster_pb, 'serve_nodes', serve_nodes)
-
-
 class Test__parse_pb_any_to_native(unittest2.TestCase):
 
     def _callFUT(self, any_val, expected_type=None):

gcloud_bigtable/test_client.py

@@ -368,6 +368,7 @@ def test_from_service_account_p12(self):
         signed_creds_kw = {
             'private_key': private_key,
             'service_account_name': client_email,
+            'scope': None,
         }
         signed_creds.check_called(self, [()], [signed_creds_kw])
         # Load private key (via _get_contents) from the key path.

gcloud_bigtable/test_cluster.py

@@ -21,6 +21,28 @@
 CLUSTER_ID = 'cluster-id'
 
 
+class Test__get_pb_property_value(unittest2.TestCase):
+
+    def _callFUT(self, message_pb, property_name):
+        from gcloud_bigtable.cluster import _get_pb_property_value
+        return _get_pb_property_value(message_pb, property_name)
+
+    def test_it(self):
+        from gcloud_bigtable._generated import (
+            bigtable_cluster_data_pb2 as data_pb2)
+        serve_nodes = 119
+        cluster_pb = data_pb2.Cluster(serve_nodes=serve_nodes)
+        result = self._callFUT(cluster_pb, 'serve_nodes')
+        self.assertEqual(result, serve_nodes)
+
+    def test_with_value_unset_on_pb(self):
+        from gcloud_bigtable._generated import (
+            bigtable_cluster_data_pb2 as data_pb2)
+        cluster_pb = data_pb2.Cluster()
+        with self.assertRaises(ValueError):
+            self._callFUT(cluster_pb, 'serve_nodes')
+
+
 class Test__prepare_create_request(unittest2.TestCase):
 
     def _callFUT(self, cluster):

pylintrc_default

@@ -96,6 +96,11 @@ load-plugins=pylint.extensions.check_docs
 #                      @_lazy_property_deco
 #                      def dataset_id():
 #                          ...
+# - redefined-variable-type: This error is overzealous and complains at e.g.
+#                      if some_prop:
+#                          return int(value)
+#                      else:
+#                          return float(value)
 disable =
     maybe-no-member,
     no-member,
@@ -104,6 +109,7 @@ disable =
     similarities,
     star-args,
     method-hidden,
+    redefined-variable-type,
 
 
 [REPORTS]
@@ -199,7 +205,7 @@ no-space-check =
 # Maximum number of lines in a module
 # DEFAULT:  max-module-lines=1000
 # RATIONALE:  API-mapping
-max-module-lines=1500
+max-module-lines=1540
 
 # String used as indentation unit. This is usually " " (4 spaces) or "\t" (1
 # tab).

run_pylint.py

@@ -50,6 +50,7 @@
     'too-many-locals',
     'too-many-public-methods',
     'unbalanced-tuple-unpacking',
+    'abstract-method',
 ]
 TEST_RC_ADDITIONS = {
     'MESSAGES CONTROL': {

system_tests/run.py

@@ -17,8 +17,9 @@
 import datetime
 import operator
 import os
-import pytz
 import time
+
+import pytz
 import unittest2
 
 from oauth2client.client import GoogleCredentials
@@ -165,13 +166,13 @@ def test_update(self):
 class TestTableAdminAPI(unittest2.TestCase):
 
     @classmethod
-    def setUpClass(self):
-        self._table = CLUSTER.table(TABLE_ID)
-        self._table.create()
+    def setUpClass(cls):
+        cls._table = CLUSTER.table(TABLE_ID)
+        cls._table.create()
 
     @classmethod
-    def tearDownClass(self):
-        self._table.delete()
+    def tearDownClass(cls):
+        cls._table.delete()
 
     def setUp(self):
         self.tables_to_delete = []
@@ -245,16 +246,16 @@ def test_delete_column_family(self):
 class TestDataAPI(unittest2.TestCase):
 
     @classmethod
-    def setUpClass(self):
-        self._table = table = CLUSTER.table(TABLE_ID)
+    def setUpClass(cls):
+        cls._table = table = CLUSTER.table(TABLE_ID)
         table.create()
         table.column_family(COLUMN_FAMILY_ID1).create()
         table.column_family(COLUMN_FAMILY_ID2).create()
 
     @classmethod
-    def tearDownClass(self):
+    def tearDownClass(cls):
         # Will also delete any data contained in the table.
-        self._table.delete()
+        cls._table.delete()
 
     def setUp(self):
         self.rows_to_delete = []

system_tests/run_happybase.py

@@ -59,9 +59,11 @@ def set_hbase_connection():
 
 
 def set_cloud_bigtable_connection():
+    # pylint: disable=no-name-in-module
     from grpc.framework.interfaces.face.face import NetworkError
     from gcloud_bigtable import client as client_mod
     from gcloud_bigtable.happybase import Connection
+    # pylint: enable=no-name-in-module
 
     client_mod.PROJECT_ENV_VAR = 'GCLOUD_TESTS_PROJECT_ID'
     client = client_mod.Client(admin=True)

tox.ini

@@ -33,7 +33,7 @@ commands =
     python run_pylint.py
 deps =
     pep8
-    -ehg+https://bitbucket.org/logilab/pylint@33e334be064c#egg=pylint
+    pylint
     unittest2
 passenv = GCLOUD_*