Merge pull request googleapis#2425 from tseaver/pylint-disable-ungrouped-imports

tseaver · web-flow · commit 8426afa74634 · 2016-10-03T21:33:47.000-04:00
Disable pylint's 'ungrouped-imports' error.
diff --git a/core/google/cloud/_helpers.py b/core/google/cloud/_helpers.py
@@ -38,10 +38,8 @@
 from six.moves import http_client
 from six.moves import configparser
 
-# pylint: disable=ungrouped-imports
 from google.cloud.environment_vars import PROJECT
 from google.cloud.environment_vars import CREDENTIALS
-# pylint: enable=ungrouped-imports
 
 
 _NOW = datetime.datetime.utcnow  # To be replaced by tests.
diff --git a/datastore/google/cloud/datastore/connection.py b/datastore/google/cloud/datastore/connection.py
@@ -28,7 +28,6 @@
 from google.cloud.exceptions import GrpcRendezvous
 from google.cloud.exceptions import make_exception
 from google.cloud.datastore._generated import datastore_pb2 as _datastore_pb2
-# pylint: disable=ungrouped-imports
 try:
     from grpc import StatusCode
     from google.cloud.datastore._generated import datastore_grpc_pb2
@@ -38,7 +37,6 @@
     StatusCode = None
 else:
     _HAVE_GRPC = True
-# pylint: enable=ungrouped-imports
 
 
 DATASTORE_API_HOST = 'datastore.googleapis.com'
diff --git a/datastore/google/cloud/datastore/helpers.py b/datastore/google/cloud/datastore/helpers.py
@@ -24,13 +24,11 @@
 from google.type import latlng_pb2
 import six
 
-# pylint: disable=ungrouped-imports
 from google.cloud._helpers import _datetime_to_pb_timestamp
 from google.cloud._helpers import _pb_timestamp_to_datetime
 from google.cloud.datastore._generated import entity_pb2 as _entity_pb2
 from google.cloud.datastore.entity import Entity
 from google.cloud.datastore.key import Key
-# pylint: enable=ungrouped-imports
 
 __all__ = ('entity_from_protobuf', 'key_from_protobuf')
 
diff --git a/logging/google/cloud/logging/_gax.py b/logging/google/cloud/logging/_gax.py
@@ -27,12 +27,10 @@
 from google.protobuf.json_format import Parse
 from grpc import StatusCode
 
-# pylint: disable=ungrouped-imports
 from google.cloud._helpers import _datetime_to_pb_timestamp
 from google.cloud._helpers import _pb_timestamp_to_rfc3339
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-# pylint: enable=ungrouped-imports
 
 
 class _LoggingAPI(object):
diff --git a/pubsub/google/cloud/pubsub/_gax.py b/pubsub/google/cloud/pubsub/_gax.py
@@ -25,12 +25,10 @@
 from grpc import insecure_channel
 from grpc import StatusCode
 
-# pylint: disable=ungrouped-imports
 from google.cloud._helpers import _to_bytes
 from google.cloud._helpers import _pb_timestamp_to_rfc3339
 from google.cloud.exceptions import Conflict
 from google.cloud.exceptions import NotFound
-# pylint: enable=ungrouped-imports
 
 
 class _PublisherAPI(object):
diff --git a/pubsub/google/cloud/pubsub/client.py b/pubsub/google/cloud/pubsub/client.py
@@ -25,7 +25,6 @@
 from google.cloud.pubsub.subscription import Subscription
 from google.cloud.pubsub.topic import Topic
 
-# pylint: disable=ungrouped-imports
 try:
     from google.cloud.pubsub._gax import _PublisherAPI as GAXPublisherAPI
     from google.cloud.pubsub._gax import _SubscriberAPI as GAXSubscriberAPI
@@ -39,7 +38,6 @@
     make_gax_subscriber_api = None
 else:
     _HAVE_GAX = True
-# pylint: enable=ungrouped-imports
 
 
 _DISABLE_GAX = os.getenv(DISABLE_GRPC, False)
diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default
@@ -112,6 +112,9 @@ confidence=
 #                      will be detected by our 100% code coverage.
 # - missing-raises-doc: New in PyLint 1.6, enforcing PEP 257 and flagged our
 #                       existing codebase.  See #1968 for eventual fixes.
+# - ungrouped-imports: We share the 'google' namespace with third-party
+#                      packages. PEP 8 wants those to be separate from "local"
+#                      imports.
 disable =
     import-star-module-level,
     old-octal-literal,
@@ -173,6 +176,7 @@ disable =
     wrong-import-position,
     no-name-in-module,
     missing-raises-doc,
+    ungrouped-imports,
 
 [REPORTS]
 
diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py
@@ -20,10 +20,8 @@
 from grpc import StatusCode
 import httplib2
 
-# pylint: disable=ungrouped-imports
 from google.cloud.environment_vars import PUBSUB_EMULATOR
 from google.cloud.pubsub import client
-# pylint: enable=ungrouped-imports
 
 from retry import RetryInstanceState
 from retry import RetryResult
