From f64ca65ad4cd9542b858031f3b44a92c400d72d5 Mon Sep 17 00:00:00 2001
From: Dolph Mathews <dolph.mathews@gmail.com>
Date: Mon, 19 Aug 2013 11:26:35 -0500
Subject: [PATCH] remove refs to keystone.common.logging

A couple references to this module were missed, and a few new ones were
created while it was in the process of being deprecated. This change
removes outstanding references to the module.

blueprint unified-logging-in-keystone

Change-Id: I4cc7614b3f74caaec9dfa100202d9d6db4ebfc36
---
 HACKING.rst                             | 4 ++--
 httpd/keystone.py                       | 2 +-
 keystone/auth/plugins/oauth1.py         | 2 +-
 keystone/contrib/oauth1/backends/kvs.py | 2 +-
 keystone/token/providers/uuid.py        | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/HACKING.rst b/HACKING.rst
index e61d0cab6d..3bb715d2ab 100644
--- a/HACKING.rst
+++ b/HACKING.rst
@@ -50,9 +50,9 @@ TODO vs FIXME
 Logging
 -------
 
-Use the built-in logging module, and ensure you ``getLogger``::
+Use the common logging module, and ensure you ``getLogger``::
 
-    from keystone.common import logging
+    from keystone.openstack.common import log as logging
 
     LOG = logging.getLogger(__name__)
 
diff --git a/httpd/keystone.py b/httpd/keystone.py
index 492d2519e0..39b5595a20 100644
--- a/httpd/keystone.py
+++ b/httpd/keystone.py
@@ -3,9 +3,9 @@ import os
 from paste import deploy
 
 from keystone.common import environment
-from keystone.common import logging
 from keystone import config
 from keystone.openstack.common import gettextutils
+from keystone.openstack.common import log as logging
 
 # NOTE(blk-u): Configure gettextutils for deferred translation of messages
 # so that error messages in responses can be translated according to the
diff --git a/keystone/auth/plugins/oauth1.py b/keystone/auth/plugins/oauth1.py
index ffebd365d3..34913e429f 100644
--- a/keystone/auth/plugins/oauth1.py
+++ b/keystone/auth/plugins/oauth1.py
@@ -16,10 +16,10 @@
 
 from keystone import auth
 from keystone.common import dependency
-from keystone.common import logging
 from keystone.contrib import oauth1
 from keystone.contrib.oauth1 import core as oauth
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 
 
diff --git a/keystone/contrib/oauth1/backends/kvs.py b/keystone/contrib/oauth1/backends/kvs.py
index 09e3174158..db95699e96 100644
--- a/keystone/contrib/oauth1/backends/kvs.py
+++ b/keystone/contrib/oauth1/backends/kvs.py
@@ -19,9 +19,9 @@ import random
 import uuid
 
 from keystone.common import kvs
-from keystone.common import logging
 from keystone.contrib.oauth1 import core
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 
 
diff --git a/keystone/token/providers/uuid.py b/keystone/token/providers/uuid.py
index 612df99917..b895dfc47b 100644
--- a/keystone/token/providers/uuid.py
+++ b/keystone/token/providers/uuid.py
@@ -23,9 +23,9 @@ import sys
 import uuid
 
 from keystone.common import dependency
-from keystone.common import logging
 from keystone import config
 from keystone import exception
+from keystone.openstack.common import log as logging
 from keystone.openstack.common import timeutils
 from keystone import token
 from keystone import trust