diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-31 08:42:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-31 08:42:30 +0000 |
| commit | bcc751b3a24a93b5d8aab1bfb7eb8027d8499e36 (patch) | |
| tree | 8f234f0f15248d0fffd0f2a6505e633485640781 | |
| parent | d80f8ebc10d6de09538a74caea2ad2007ac53a95 (diff) | |
| parent | 2844a38f7fc024fbc7c6c4ceee5edd20ab69bc3e (diff) | |
| download | keystone-bcc751b3a24a93b5d8aab1bfb7eb8027d8499e36.tar.gz | |
Merge "Stop to use the __future__ module."
| -rw-r--r-- | keystone/cmd/cli.py | 3 | ||||
| -rw-r--r-- | keystone/cmd/doctor/ldap.py | 2 | ||||
| -rw-r--r-- | keystone/identity/backends/ldap/core.py | 1 | ||||
| -rw-r--r-- | keystone/oauth1/core.py | 2 | ||||
| -rw-r--r-- | keystone/server/flask/application.py | 2 | ||||
| -rw-r--r-- | keystone/tests/unit/core.py | 2 |
6 files changed, 0 insertions, 12 deletions
diff --git a/keystone/cmd/cli.py b/keystone/cmd/cli.py index acfffa344..6cd10cfb6 100644 --- a/keystone/cmd/cli.py +++ b/keystone/cmd/cli.py @@ -12,9 +12,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import -from __future__ import print_function - import argparse import datetime import os diff --git a/keystone/cmd/doctor/ldap.py b/keystone/cmd/doctor/ldap.py index 96e006840..cc1bd8a70 100644 --- a/keystone/cmd/doctor/ldap.py +++ b/keystone/cmd/doctor/ldap.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import print_function - import os import re diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap/core.py index d1cf7608a..07f037a40 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap/core.py @@ -11,7 +11,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import import uuid import ldap.filter diff --git a/keystone/oauth1/core.py b/keystone/oauth1/core.py index 68e208e2a..dd8a4482a 100644 --- a/keystone/oauth1/core.py +++ b/keystone/oauth1/core.py @@ -14,8 +14,6 @@ """Main entry point into the OAuth1 service.""" -from __future__ import absolute_import - import uuid import oauthlib.common diff --git a/keystone/server/flask/application.py b/keystone/server/flask/application.py index 286fd5945..12d59b289 100644 --- a/keystone/server/flask/application.py +++ b/keystone/server/flask/application.py @@ -10,8 +10,6 @@ # License for the specific language governing permissions and limitations # under the License. -from __future__ import absolute_import - import functools import sys diff --git a/keystone/tests/unit/core.py b/keystone/tests/unit/core.py index 0cb462728..3c65bfbe6 100644 --- a/keystone/tests/unit/core.py +++ b/keystone/tests/unit/core.py @@ -11,8 +11,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. - -from __future__ import absolute_import import atexit import base64 import contextlib |