mistercrunch closed pull request #3696: [AIRFLOW-2851] Canonicalize "as _..." etc imports URL: https://github.com/apache/incubator-airflow/pull/3696
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/airflow/configuration.py b/airflow/configuration.py index 2e05fde0cd..ed8943ac77 100644 --- a/airflow/configuration.py +++ b/airflow/configuration.py @@ -36,7 +36,7 @@ import warnings from backports.configparser import ConfigParser -from zope.deprecation import deprecated as _deprecated +from zope.deprecation import deprecated from airflow.exceptions import AirflowConfigException from airflow.utils.log.logging_mixin import LoggingMixin @@ -534,7 +534,7 @@ def parameterized_config(template): for func in [load_test_config, get, getboolean, getfloat, getint, has_option, remove_option, as_dict, set]: - _deprecated( + deprecated( func, "Accessing configuration method '{f.__name__}' directly from " "the configuration module is deprecated. Please access the " diff --git a/airflow/contrib/auth/backends/kerberos_auth.py b/airflow/contrib/auth/backends/kerberos_auth.py index 08be299a19..fdb6204967 100644 --- a/airflow/contrib/auth/backends/kerberos_auth.py +++ b/airflow/contrib/auth/backends/kerberos_auth.py @@ -28,7 +28,7 @@ # pykerberos should be used as it verifies the KDC, the "kerberos" module does not do so # and make it possible to spoof the KDC import kerberos -import airflow.security.utils as utils +from airflow.security import utils from flask import url_for, redirect diff --git a/airflow/contrib/hooks/__init__.py b/airflow/contrib/hooks/__init__.py index 95f9892d89..6c31842578 100644 --- a/airflow/contrib/hooks/__init__.py +++ b/airflow/contrib/hooks/__init__.py @@ -24,7 +24,7 @@ import sys -import os as _os +import os # ------------------------------------------------------------------------ # @@ -64,7 +64,7 @@ } -if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): +if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): from airflow.utils.helpers import AirflowImporter airflow_importer = AirflowImporter(sys.modules[__name__], _hooks) diff --git a/airflow/contrib/operators/__init__.py b/airflow/contrib/operators/__init__.py index 3485aaa7fd..247ec5941f 100644 --- a/airflow/contrib/operators/__init__.py +++ b/airflow/contrib/operators/__init__.py @@ -24,7 +24,7 @@ import sys -import os as _os +import os # ------------------------------------------------------------------------ # @@ -48,6 +48,6 @@ 'hive_to_dynamodb': ['HiveToDynamoDBTransferOperator'] } -if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): +if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): from airflow.utils.helpers import AirflowImporter airflow_importer = AirflowImporter(sys.modules[__name__], _operators) diff --git a/airflow/hooks/__init__.py b/airflow/hooks/__init__.py index 1f1c40f16a..38a7dcfebe 100644 --- a/airflow/hooks/__init__.py +++ b/airflow/hooks/__init__.py @@ -18,7 +18,7 @@ # under the License. -import os as _os +import os import sys @@ -67,7 +67,7 @@ } -if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): +if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): from airflow.utils.helpers import AirflowImporter airflow_importer = AirflowImporter(sys.modules[__name__], _hooks) @@ -82,12 +82,12 @@ def _integrate_plugins(): ########################################################## # TODO FIXME Remove in Airflow 2.0 - if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): - from zope.deprecation import deprecated as _deprecated + if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): + from zope.deprecation import deprecated for _hook in hooks_module._objects: hook_name = _hook.__name__ globals()[hook_name] = _hook - _deprecated( + deprecated( hook_name, "Importing plugin hook '{i}' directly from " "'airflow.hooks' has been deprecated. Please " diff --git a/airflow/hooks/hive_hooks.py b/airflow/hooks/hive_hooks.py index 5ac99eec6c..8df96c464f 100644 --- a/airflow/hooks/hive_hooks.py +++ b/airflow/hooks/hive_hooks.py @@ -34,10 +34,10 @@ from past.builtins import unicode from six.moves import zip -import airflow.security.utils as utils from airflow import configuration from airflow.exceptions import AirflowException from airflow.hooks.base_hook import BaseHook +from airflow.security import utils from airflow.utils.file import TemporaryDirectory from airflow.utils.helpers import as_flattened_list from airflow.utils.operator_helpers import AIRFLOW_VAR_NAME_FORMAT_MAPPING diff --git a/airflow/macros/__init__.py b/airflow/macros/__init__.py index 3c33acda5d..81782727eb 100644 --- a/airflow/macros/__init__.py +++ b/airflow/macros/__init__.py @@ -78,13 +78,13 @@ def _integrate_plugins(): ########################################################## # TODO FIXME Remove in Airflow 2.0 - import os as _os - if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): - from zope.deprecation import deprecated as _deprecated + import os + if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): + from zope.deprecation import deprecated for _macro in macros_module._objects: macro_name = _macro.__name__ globals()[macro_name] = _macro - _deprecated( + deprecated( macro_name, "Importing plugin macro '{i}' directly from " "'airflow.macros' has been deprecated. Please " diff --git a/airflow/operators/__init__.py b/airflow/operators/__init__.py index efdfd3ebe2..c8cc981e93 100644 --- a/airflow/operators/__init__.py +++ b/airflow/operators/__init__.py @@ -110,11 +110,11 @@ def _integrate_plugins(): # TODO FIXME Remove in Airflow 2.0 if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): - from zope.deprecation import deprecated as _deprecated + from zope.deprecation import deprecated for _operator in operators_module._objects: operator_name = _operator.__name__ globals()[operator_name] = _operator - _deprecated( + deprecated( operator_name, "Importing plugin operator '{i}' directly from " "'airflow.operators' has been deprecated. Please " diff --git a/airflow/sensors/__init__.py b/airflow/sensors/__init__.py index b9d1dbb03d..5036251d66 100644 --- a/airflow/sensors/__init__.py +++ b/airflow/sensors/__init__.py @@ -18,7 +18,7 @@ # under the License. # import sys -import os as _os +import os _sensors = { 'base_sensor_operator': ['BaseSensorOperator'], @@ -36,7 +36,7 @@ 'web_hdfs_sensor': ['WebHdfsSensor'] } -if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): +if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): from airflow.utils.helpers import AirflowImporter airflow_importer = AirflowImporter(sys.modules[__name__], _sensors) @@ -51,12 +51,12 @@ def _integrate_plugins(): ########################################################## # TODO FIXME Remove in Airflow 2.0 - if not _os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): - from zope.deprecation import deprecated as _deprecated + if not os.environ.get('AIRFLOW_USE_NEW_IMPORTS', False): + from zope.deprecation import deprecated for _sensor in sensors_module._objects: sensor_name = _sensor.__name__ globals()[sensor_name] = _sensor - _deprecated( + deprecated( sensor_name, "Importing plugin operator '{i}' directly from " "'airflow.operators' has been deprecated. Please " diff --git a/tests/contrib/hooks/test_gcs_hook.py b/tests/contrib/hooks/test_gcs_hook.py index fb65938fd9..87d6def1c2 100644 --- a/tests/contrib/hooks/test_gcs_hook.py +++ b/tests/contrib/hooks/test_gcs_hook.py @@ -19,8 +19,7 @@ import unittest -import airflow.contrib.hooks.gcs_hook as gcs_hook - +from airflow.contrib.hooks import gcs_hook from airflow.exceptions import AirflowException from apiclient.errors import HttpError ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services