Skip to content

Commit 95238be

Browse files
committed
Merge pull request #1583 from tseaver/pylint-ignore_six_and_google_protobf
Hide 'six' and 'google.protobuf' from pylint's borked import sniffing.
2 parents d38fd23 + dfced8a commit 95238be

6 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎gcloud/_helpers.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
fromgoogle.protobufimporttimestamp_pb2
2727
importsix
28-
fromsix.moves.http_clientimportHTTPConnection# pylint: disable=F0401
28+
fromsix.moves.http_clientimportHTTPConnection
2929

3030
fromgcloud.environment_varsimportPROJECT
3131

‎gcloud/connection.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
importjson
1818
frompkg_resourcesimportget_distribution
1919
importsix
20-
fromsix.moves.urllib.parseimporturlencode# pylint: disable=F0401
20+
fromsix.moves.urllib.parseimporturlencode
2121

2222
importhttplib2
2323

‎gcloud/credentials.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
importbase64
1818
importdatetime
1919
importsix
20-
fromsix.moves.urllib.parseimporturlencode# pylint: disable=F0401
20+
fromsix.moves.urllib.parseimporturlencode
2121

2222
fromoauth2clientimportclient
2323

‎gcloud/storage/blob.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
importtime
2323

2424
importsix
25-
fromsix.moves.urllib.parseimportquote# pylint: disable=F0401
25+
fromsix.moves.urllib.parseimportquote
2626

2727
fromgcloud._helpersimport_rfc3339_to_datetime
2828
fromgcloud.credentialsimportgenerate_signed_url

‎gcloud/streaming/http_wrapper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212

1313
importhttplib2
1414
importsix
15-
fromsix.movesimporthttp_client# pylint: disable=F0401
16-
fromsix.moves.urllibimportparse# pylint: disable=F0401
15+
fromsix.movesimporthttp_client
16+
fromsix.moves.urllibimportparse
1717

1818
fromgcloud.streaming.exceptionsimportBadStatusCodeError
1919
fromgcloud.streaming.exceptionsimportRequestError

‎scripts/pylintrc_default‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,9 @@ good-names = i, j, k, ex, Run, _,
320320
# (useful for modules/projects where namespaces are manipulated during runtime
321321
# and thus existing member attributes cannot be deduced by static analysis
322322
# DEFAULT: ignored-modules=
323+
# RATIONALE: six aliases stuff for compatibility.
324+
# google.protobuf fixes up namespace package "late".
325+
ignored-modules = six, google.protobuf
323326

324327
# List of classes names for which member attributes should not be checked
325328
# (useful for classes with attributes dynamically set).

0 commit comments

Comments
 (0)