diff options
| author | Adam Young <ayoung@redhat.com> | 2013-06-20 01:02:17 -0400 |
|---|---|---|
| committer | Adam Young <ayoung@redhat.com> | 2013-06-20 17:00:00 -0400 |
| commit | b9e46fb9c455eed584cb52db3b92ff3d8060a414 (patch) | |
| tree | 8500aefd9e1538bd2410fe8b2a3d9e1b36cec3ad /keystone/identity | |
| parent | 7ccfac73fb204e65f6cdcb8aa2ed6a053846967c (diff) | |
| download | keystone-b9e46fb9c455eed584cb52db3b92ff3d8060a414.tar.gz keystone-b9e46fb9c455eed584cb52db3b92ff3d8060a414.tar.xz keystone-b9e46fb9c455eed584cb52db3b92ff3d8060a414.zip | |
Move identity ldap backend from directory to file
The LDAP backend for identity was in a subdirectory as opposed to a file
due to a clash between the name of the local package and the standard python package
both being called ldap.
This change makes the ldap backend look like the other backend.
The mechanism that fixes it is:
from __future__ import absolute_import
Change-Id: Id9ee518238ae22e5128351094eb3764a831cc083
Diffstat (limited to 'keystone/identity')
| -rw-r--r-- | keystone/identity/backends/ldap.py (renamed from keystone/identity/backends/ldap/core.py) | 2 | ||||
| -rw-r--r-- | keystone/identity/backends/ldap/__init__.py | 18 |
2 files changed, 1 insertions, 19 deletions
diff --git a/keystone/identity/backends/ldap/core.py b/keystone/identity/backends/ldap.py index 2795197e..2e553bc0 100644 --- a/keystone/identity/backends/ldap/core.py +++ b/keystone/identity/backends/ldap.py @@ -13,7 +13,7 @@ # 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 diff --git a/keystone/identity/backends/ldap/__init__.py b/keystone/identity/backends/ldap/__init__.py deleted file mode 100644 index 043f9e8f..00000000 --- a/keystone/identity/backends/ldap/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# vim: tabstop=4 shiftwidth=4 softtabstop=4 -# flake8: noqa - -# Copyright 2012 OpenStack LLC -# -# Licensed under the Apache License, Version 2.0 (the "License"); you may -# not use this file except in compliance with the License. You may obtain -# a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT -# 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 keystone.identity.backends.ldap.core import * |