Merge pull request #1583 from tseaver/pylint-ignore_six_and_google_protobf

tseaver · tseaver · commit 95238be279fc · 2016-03-08T10:57:29.000-05:00
Hide 'six' and 'google.protobuf' from pylint's borked import sniffing.
diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py
@@ -25,7 +25,7 @@
 
 from google.protobuf import timestamp_pb2
 import six
-from six.moves.http_client import HTTPConnection  # pylint: disable=F0401
+from six.moves.http_client import HTTPConnection
 
 from gcloud.environment_vars import PROJECT
 
diff --git a/gcloud/connection.py b/gcloud/connection.py
@@ -17,7 +17,7 @@
 import json
 from pkg_resources import get_distribution
 import six
-from six.moves.urllib.parse import urlencode  # pylint: disable=F0401
+from six.moves.urllib.parse import urlencode
 
 import httplib2
 
diff --git a/gcloud/credentials.py b/gcloud/credentials.py
@@ -17,7 +17,7 @@
 import base64
 import datetime
 import six
-from six.moves.urllib.parse import urlencode  # pylint: disable=F0401
+from six.moves.urllib.parse import urlencode
 
 from oauth2client import client
 
diff --git a/gcloud/storage/blob.py b/gcloud/storage/blob.py
@@ -22,7 +22,7 @@
 import time
 
 import six
-from six.moves.urllib.parse import quote  # pylint: disable=F0401
+from six.moves.urllib.parse import quote
 
 from gcloud._helpers import _rfc3339_to_datetime
 from gcloud.credentials import generate_signed_url
diff --git a/gcloud/streaming/http_wrapper.py b/gcloud/streaming/http_wrapper.py
@@ -12,8 +12,8 @@
 
 import httplib2
 import six
-from six.moves import http_client   # pylint: disable=F0401
-from six.moves.urllib import parse  # pylint: disable=F0401
+from six.moves import http_client
+from six.moves.urllib import parse
 
 from gcloud.streaming.exceptions import BadStatusCodeError
 from gcloud.streaming.exceptions import RequestError
diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default
@@ -320,6 +320,9 @@ good-names = i, j, k, ex, Run, _,
 # (useful for modules/projects where namespaces are manipulated during runtime
 # and thus existing member attributes cannot be deduced by static analysis
 # DEFAULT:  ignored-modules=
+# RATIONALE:  six aliases stuff for compatibility.
+#             google.protobuf fixes up namespace package "late".
+ignored-modules = six, google.protobuf
 
 # List of classes names for which member attributes should not be checked
 # (useful for classes with attributes dynamically set).
