[jira] [Commented] (AIRFLOW-2851) Canonicalize "as _..." etc imports
[
https://issues.apache.org/jira/browse/AIRFLOW-2851?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16572155#comment-16572155
]
ASF GitHub Bot commented on AIRFLOW-2851:
-
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
[jira] [Commented] (AIRFLOW-2851) Canonicalize "as _..." etc imports
[ https://issues.apache.org/jira/browse/AIRFLOW-2851?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16572156#comment-16572156 ] ASF subversion and git services commented on AIRFLOW-2851: -- Commit 9131d6cc8fce515222da6e4ab9d86cce69f20d1e in incubator-airflow's branch refs/heads/master from Taylor D. Edmiston [ https://gitbox.apache.org/repos/asf?p=incubator-airflow.git;h=9131d6c ] [AIRFLOW-2851] Canonicalize "as _..." etc imports (#3696) > Canonicalize "as _..." etc imports > -- > > Key: AIRFLOW-2851 > URL: https://issues.apache.org/jira/browse/AIRFLOW-2851 > Project: Apache Airflow > Issue Type: Improvement >Reporter: Taylor Edmiston >Assignee: Taylor Edmiston >Priority: Minor > > This PR: > 1. Replaces `import foo as _foo` style imports with the more common `import > foo` used everywhere else across the codebase. I dug through history and > couldn't find special reasons to maintain the as style imports here (I think > it's just old code). Currently (33dd33c89d4b6454d224ca34bab5ae37fb9812a6), > there are just a handful of import lines using `as _...` vs thousands not > using it, so the goal here is to improve consistency. > 2. It also simplifies `import foo.bar as bar` style imports to equivalent > `from foo import bar`. -- This message was sent by Atlassian JIRA (v7.6.3#76005)
[jira] [Commented] (AIRFLOW-2851) Canonicalize "as _..." etc imports
[
https://issues.apache.org/jira/browse/AIRFLOW-2851?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16569284#comment-16569284
]
ASF GitHub Bot commented on AIRFLOW-2851:
-
tedmiston opened a new pull request #3696: [AIRFLOW-2851] Canonicalize "as
_..." etc imports
URL: https://github.com/apache/incubator-airflow/pull/3696
Make sure you have checked _all_ steps below.
### Jira
- [x] My PR addresses the following [Airflow
Jira](https://issues.apache.org/jira/browse/AIRFLOW/) issues and references
them in the PR title. For example, "\[AIRFLOW-XXX\] My Airflow PR"
- https://issues.apache.org/jira/browse/AIRFLOW-2851
- In case you are fixing a typo in the documentation you can prepend your
commit with \[AIRFLOW-XXX\], code changes always need a Jira issue.
### Description
- [x] Here are some details about my PR, including screenshots of any UI
changes:
This PR:
1. Replaces `import foo as _foo` style imports with the more common `import
foo` used everywhere else across the codebase. I dug through history and
couldn't find special reasons to maintain the as style imports here (I think
it's just old code). Currently (33dd33c89d4b6454d224ca34bab5ae37fb9812a6),
there are just a handful of import lines using `as _...` vs thousands not using
it, so the goal here is to improve consistency.
2. It also simplifies `import foo.bar as bar` style imports to equivalent
`from foo import bar`.
### Tests
- [x] My PR adds the following unit tests __OR__ does not need testing for
this extremely good reason:
Coverage by existing tests.
### Commits
- [x] My commits all reference Jira issues in their subject lines, and I
have squashed multiple commits if they address the same issue. In addition, my
commits follow the guidelines from "[How to write a good git commit
message](http://chris.beams.io/posts/git-commit/)":
1. Subject is separated from body by a blank line
1. Subject is limited to 50 characters (not including Jira issue reference)
1. Subject does not end with a period
1. Subject uses the imperative mood ("add", not "adding")
1. Body wraps at 72 characters
1. Body explains "what" and "why", not "how"
### Documentation
- [x] In case of new functionality, my PR adds documentation that describes
how to use it.
- When adding new operators/hooks/sensors, the autoclass documentation
generation needs to be added.
### Code Quality
- [x] Passes `git diff upstream/master -u -- "*.py" | flake8 --diff`
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
> Canonicalize "as _..." etc imports
> --
>
> Key: AIRFLOW-2851
> URL: https://issues.apache.org/jira/browse/AIRFLOW-2851
> Project: Apache Airflow
> Issue Type: Improvement
>Reporter: Taylor Edmiston
>Assignee: Taylor Edmiston
>Priority: Minor
>
> This PR:
> 1. Replaces `import foo as _foo` style imports with the more common `import
> foo` used everywhere else across the codebase. I dug through history and
> couldn't find special reasons to maintain the as style imports here (I think
> it's just old code). Currently (33dd33c89d4b6454d224ca34bab5ae37fb9812a6),
> there are just a handful of import lines using `as _...` vs thousands not
> using it, so the goal here is to improve consistency.
> 2. It also simplifies `import foo.bar as bar` style imports to equivalent
> `from foo import bar`.
--
This message was sent by Atlassian JIRA
(v7.6.3#76005)
