From bc8d742e8d80e4fcd1af99420a199793364c01e0 Mon Sep 17 00:00:00 2001
From: Brant Knudson <bknudson@us.ibm.com>
Date: Tue, 1 Jul 2014 16:03:57 -0500
Subject: [PATCH] Clean up openstack-common.conf

Keystonemiddleware doesn't use the config fixture, and it doesn't use
strutils directly, so remove these modules from openstack-common.conf
and re-sync.

Change-Id: I23bc410a6efc2b124bc7bd780b822f05d4204026
---
 .../openstack/common/fixture/__init__.py      |  0
 .../openstack/common/fixture/config.py        | 85 -------------------
 openstack-common.conf                         |  2 -
 3 files changed, 87 deletions(-)
 delete mode 100644 keystonemiddleware/openstack/common/fixture/__init__.py
 delete mode 100644 keystonemiddleware/openstack/common/fixture/config.py

diff --git a/keystonemiddleware/openstack/common/fixture/__init__.py b/keystonemiddleware/openstack/common/fixture/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/keystonemiddleware/openstack/common/fixture/config.py b/keystonemiddleware/openstack/common/fixture/config.py
deleted file mode 100644
index 9489b85a..00000000
--- a/keystonemiddleware/openstack/common/fixture/config.py
+++ /dev/null
@@ -1,85 +0,0 @@
-#
-# Copyright 2013 Mirantis, Inc.
-# Copyright 2013 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.
-
-import fixtures
-from oslo.config import cfg
-import six
-
-
-class Config(fixtures.Fixture):
-    """Allows overriding configuration settings for the test.
-
-    `conf` will be reset on cleanup.
-
-    """
-
-    def __init__(self, conf=cfg.CONF):
-        self.conf = conf
-
-    def setUp(self):
-        super(Config, self).setUp()
-        # NOTE(morganfainberg): unregister must be added to cleanup before
-        # reset is because cleanup works in reverse order of registered items,
-        # and a reset must occur before unregistering options can occur.
-        self.addCleanup(self._unregister_config_opts)
-        self.addCleanup(self.conf.reset)
-        self._registered_config_opts = {}
-
-    def config(self, **kw):
-        """Override configuration values.
-
-        The keyword arguments are the names of configuration options to
-        override and their values.
-
-        If a `group` argument is supplied, the overrides are applied to
-        the specified configuration option group, otherwise the overrides
-        are applied to the ``default`` group.
-
-        """
-
-        group = kw.pop('group', None)
-        for k, v in six.iteritems(kw):
-            self.conf.set_override(k, v, group)
-
-    def _unregister_config_opts(self):
-        for group in self._registered_config_opts:
-            self.conf.unregister_opts(self._registered_config_opts[group],
-                                      group=group)
-
-    def register_opt(self, opt, group=None):
-        """Register a single option for the test run.
-
-        Options registered in this manner will automatically be unregistered
-        during cleanup.
-
-        If a `group` argument is supplied, it will register the new option
-        to that group, otherwise the option is registered to the ``default``
-        group.
-        """
-        self.conf.register_opt(opt, group=group)
-        self._registered_config_opts.setdefault(group, set()).add(opt)
-
-    def register_opts(self, opts, group=None):
-        """Register multiple options for the test run.
-
-        This works in the same manner as register_opt() but takes a list of
-        options as the first argument. All arguments will be registered to the
-        same group if the ``group`` argument is supplied, otherwise all options
-        will be registered to the ``default`` group.
-        """
-        for opt in opts:
-            self.register_opt(opt, group=group)
diff --git a/openstack-common.conf b/openstack-common.conf
index e6f394ca..2dc8fb82 100644
--- a/openstack-common.conf
+++ b/openstack-common.conf
@@ -2,10 +2,8 @@
 
 # The list of modules to copy from oslo-incubator
 module=install_venv_common
-module=fixture.config
 module=jsonutils
 module=memorycache
-module=strutils
 module=timeutils
 
 # The base module to hold the copy of openstack.common