Commit 88e036cb authored by Michael Still's avatar Michael Still Committed by Steve Martinelli

Remove o/c/local.py and o/c/log.py

Move over to the fancy new oslo logging library.

Removing openstack/common from all OpenStack code in favor of the
Oslo libraries is a project wide goal for the Ocata release.

Change-Id: I552af5b9cf8586b32eb45b2c288d3d2a260fbcb5
parent 77202c1d
......@@ -18,9 +18,11 @@ import errno
import os
import tempfile
from oslo_log import log as logging
from climateclient.openstack.common import excutils
from climateclient.openstack.common.gettextutils import _
from climateclient.openstack.common import log as logging
LOG = logging.getLogger(__name__)
......
# Copyright 2011 OpenStack Foundation.
# All Rights Reserved.
#
# 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.
"""Local storage of variables using weak references"""
import threading
import weakref
class WeakLocal(threading.local):
def __getattribute__(self, attr):
rval = super(WeakLocal, self).__getattribute__(attr)
if rval:
# NOTE(mikal): this bit is confusing. What is stored is a weak
# reference, not the value itself. We therefore need to lookup
# the weak reference and return the inner value here.
rval = rval()
return rval
def __setattr__(self, attr, value):
value = weakref.ref(value)
return super(WeakLocal, self).__setattr__(attr, value)
# NOTE(mikal): the name "store" should be deprecated in the future
store = WeakLocal()
# A "weak" store uses weak references and allows an object to fall out of scope
# when it falls out of scope in the code that uses the thread local storage. A
# "strong" store will hold a reference to the object so that it never falls out
# of scope.
weak_store = WeakLocal()
strong_store = threading.local()
......@@ -26,10 +26,10 @@ import time
import weakref
from oslo_config import cfg
from oslo_log import log as logging
from climateclient.openstack.common import fileutils
from climateclient.openstack.common.gettextutils import _
from climateclient.openstack.common import log as logging
LOG = logging.getLogger(__name__)
......
This diff is collapsed.
......@@ -5,3 +5,4 @@ python-keystoneclient>=0.10.0
requests>=1.2.1
six>=1.7.0
Babel>=1.3
oslo.log>=3.11.0 # Apache-2.0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment