Merge pull request #1248 from dhermes/update-for-new-pylint

Updated source for Pylint 1.5.

Author: dhermes

gcloud/_helpers.py

@@ -19,23 +19,20 @@
 import calendar
 import datetime
 import os
-import six
+from threading import local as Local
 import socket
 
-try:
-    from threading import local as Local
-except ImportError:     # pragma: NO COVER (who doesn't have it?)
-    class Local(object):
-        """Placeholder for non-threaded applications."""
-
+import six
 from six.moves.http_client import HTTPConnection  # pylint: disable=F0401
 
+from gcloud.environment_vars import PROJECT
+
+# pylint: disable=wrong-import-position
 try:
     from google.appengine.api import app_identity
 except ImportError:
     app_identity = None
-
-from gcloud.environment_vars import PROJECT
+# pylint: enable=wrong-import-position
 
 
 _NOW = datetime.datetime.utcnow  # To be replaced by tests.
@@ -297,7 +294,7 @@ def _to_bytes(value, encoding='ascii'):
 
 
 try:
-    from pytz import UTC  # pylint: disable=unused-import
+    from pytz import UTC  # pylint: disable=unused-import,wrong-import-position
 except ImportError:
     UTC = _UTC()  # Singleton instance to be used throughout.
 

gcloud/bigquery/dataset.py

@@ -60,10 +60,13 @@ class Dataset(object):
     :param access_grants: roles granted to entities for this dataset
     """
 
+    _access_grants = None
+
     def __init__(self, name, client, access_grants=()):
         self.name = name
         self._client = client
         self._properties = {}
+        # Let the @property do validation.
         self.access_grants = access_grants
 
     @property
@@ -283,7 +286,8 @@ def _require_client(self, client):
             client = self._client
         return client
 
-    def _parse_access_grants(self, access):
+    @staticmethod
+    def _parse_access_grants(access):
         """Parse a resource fragment into a set of access grants.
 
         :type access: list of mappings

gcloud/bigquery/job.py

@@ -444,10 +444,14 @@ class LoadTableFromStorageJob(_AsyncJob):
     :type schema: list of :class:`gcloud.bigquery.table.SchemaField`
     :param schema: The job's schema
     """
+
+    _schema = None
+
     def __init__(self, name, destination, source_uris, client, schema=()):
         super(LoadTableFromStorageJob, self).__init__(name, client)
         self.destination = destination
         self.source_uris = source_uris
+        # Let the @property do validation.
         self.schema = schema
         self._configuration = _LoadConfiguration()
 

gcloud/bigquery/table.py

@@ -72,10 +72,13 @@ class Table(object):
     :param schema: The table's schema
     """
 
+    _schema = None
+
     def __init__(self, name, dataset, schema=()):
         self.name = name
         self._dataset = dataset
         self._properties = {}
+        # Let the @property do validation.
         self.schema = schema
 
     @property

gcloud/client.py

@@ -31,9 +31,6 @@ class _ClientFactoryMixin(object):
         This class is virtual.
     """
 
-    def __init__(self, *args, **kwargs):
-        raise NotImplementedError('_ClientFactoryMixin is a virtual class')
-
     @classmethod
     def from_service_account_json(cls, json_credentials_path, *args, **kwargs):
         """Factory to retrieve JSON credentials while creating client.

gcloud/credentials.py

@@ -26,21 +26,22 @@
 from oauth2client.client import _get_application_default_credential_from_file
 from oauth2client import crypt
 from oauth2client import service_account
-
-try:
-    from google.appengine.api import app_identity
-except ImportError:
-    app_identity = None
-
 try:
     from oauth2client.appengine import AppAssertionCredentials as _GAECreds
 except ImportError:
     class _GAECreds(object):
         """Dummy class if not in App Engine environment."""
 
+# pylint: disable=wrong-import-position
+try:
+    from google.appengine.api import app_identity
+except ImportError:
+    app_identity = None
+
 from gcloud._helpers import UTC
 from gcloud._helpers import _NOW
 from gcloud._helpers import _microseconds_from_datetime
+# pylint: enable=wrong-import-position
 
 
 def get_credentials():

gcloud/datastore/entity.py

@@ -92,7 +92,7 @@ def __eq__(self, other):
         :returns: True if the entities compare equal, else False.
         """
         if not isinstance(other, Entity):
-            return NotImplemented
+            return False
 
         return (self.key == other.key and
                 super(Entity, self).__eq__(other))
@@ -106,7 +106,7 @@ def __ne__(self, other):
         :rtype: boolean
         :returns: False if the entities compare equal, else True.
         """
-        return not self == other
+        return not self.__eq__(other)
 
     @property
     def kind(self):

gcloud/datastore/key.py

@@ -79,7 +79,7 @@ def __eq__(self, other):
         :returns: True if the keys compare equal, else False.
         """
         if not isinstance(other, Key):
-            return NotImplemented
+            return False
 
         if self.is_partial or other.is_partial:
             return False
@@ -99,7 +99,7 @@ def __ne__(self, other):
         :rtype: boolean
         :returns: False if the keys compare equal, else True.
         """
-        return not self == other
+        return not self.__eq__(other)
 
     def __hash__(self):
         """Hash a keys for use in a dictionary lookp.

gcloud/datastore/test_client.py

@@ -677,6 +677,7 @@ def test_delete_multi_no_keys(self):
         client = self._makeOne(credentials=creds)
         result = client.delete_multi([])
         self.assertEqual(result, None)
+        self.assertEqual(len(client.connection._commit_cw), 0)
 
     def test_delete_multi_no_batch(self):
         from gcloud.datastore.test_batch import _CommitResult

gcloud/search/document.py

@@ -182,7 +182,8 @@ def from_api_repr(cls, resource, index):
         document._parse_fields_resource(resource)
         return document
 
-    def _parse_value_resource(self, resource):
+    @staticmethod
+    def _parse_value_resource(resource):
         """Helper for _parse_fields_resource"""
         if 'stringValue' in resource:
             string_format = resource.get('stringFormat')
@@ -245,7 +246,8 @@ def _require_client(self, client):
             client = self.index._client
         return client
 
-    def _build_value_resource(self, value):
+    @staticmethod
+    def _build_value_resource(value):
         """Helper for _build_fields_resource"""
         result = {}
         if value.value_type == 'string':