diff --git a/gcloud/_helpers.py b/gcloud/_helpers.py index b78404224b37..2d44b99f379d 100644 --- a/gcloud/_helpers.py +++ b/gcloud/_helpers.py @@ -27,12 +27,10 @@ from gcloud.environment_vars import PROJECT -# pylint: disable=wrong-import-position try: from google.appengine.api import app_identity except ImportError: app_identity = None -# pylint: enable=wrong-import-position _NOW = datetime.datetime.utcnow # To be replaced by tests. diff --git a/gcloud/credentials.py b/gcloud/credentials.py index bfe892633aec..cd61b7ff1955 100644 --- a/gcloud/credentials.py +++ b/gcloud/credentials.py @@ -32,7 +32,6 @@ 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: @@ -41,7 +40,6 @@ class _GAECreds(object): 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(): diff --git a/pylintrc_default b/pylintrc_default index 27c4b5db9f2d..79c31cf9a83c 100644 --- a/pylintrc_default +++ b/pylintrc_default @@ -85,6 +85,16 @@ load-plugins=pylint.extensions.check_docs # return int(value) # else: # return float(value) +# - wrong-import-position: This error is overzealous. It assumes imports are +# completed whenever something non-trivial is +# defined, e.g. +# try: +# from foo import Bar +# except ImportError: +# class Bar(object): +# """Hi everyone""" +# and thus causes subsequent imports to be +# diagnosed as out-of-order. disable = maybe-no-member, no-member, @@ -94,6 +104,7 @@ disable = star-args, method-hidden, redefined-variable-type, + wrong-import-position, [REPORTS]