Created
May 11, 2015 12:53
-
-
Save giuliopaci/cdb18e75b260a4ac2d99 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Description: Fixes log import with recent keystone version | |
Author: Giulio Paci <giuliopaci@gmail.com> | |
Forwarded: yes | |
--- a/keystone_scim/contrib/scim/controllers.py | |
+++ b/keystone_scim/contrib/scim/controllers.py | |
@@ -26,7 +26,8 @@ | |
from keystone.common import driver_hints | |
from keystone.common import wsgi | |
from keystone.identity.controllers import UserV3, GroupV3 | |
-from keystone.openstack.common import log | |
+try: from oslo_log import log | |
+except ImportError: from keystone.openstack.common import log | |
from keystone.openstack.common import versionutils | |
import converter as conv | |
import schemas |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment