Merge "Do not import our namespace package"

oslo_config/cfg.py

@@ -128,7 +128,7 @@ and --config-dir::
             self.register_cli_opts(opts)
 
 Option values are parsed from any supplied config files using
-oslo.config.iniparser. If none are specified, a default set is used
+oslo_config.iniparser. If none are specified, a default set is used
 for example glance-api.conf and glance-common.conf::
 
     glance-api.conf:
@@ -271,7 +271,7 @@ Global ConfigOpts
 This module also contains a global instance of the ConfigOpts class
 in order to support a common usage pattern in OpenStack::
 
-    from oslo.config import cfg
+    from oslo_config import cfg
 
     opts = [
         cfg.StrOpt('bind_host', default='0.0.0.0'),

oslo_config/cfgfilter.py

@@ -77,8 +77,8 @@ which the API user supplies to the library. For example::
 
   from __future__ import print_function
 
-  from oslo.config.cfg import *
-  from oslo.config.cfgfilter import *
+  from oslo_config.cfg import *
+  from oslo_config.cfgfilter import *
 
   class Widget(object):
 
@@ -101,7 +101,7 @@ which the API user supplies to the library. For example::
 import collections
 import itertools
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 class ConfigFilter(collections.Mapping):

oslo_config/fixture.py

@@ -18,7 +18,7 @@
 import fixtures
 import six
 
-from oslo.config import cfg
+from oslo_config import cfg
 
 
 class Config(fixtures.Fixture):

oslo_config/types.py

@@ -15,7 +15,7 @@
 """Type conversion and validation classes for configuration options.
 
 Use these classes as values for the `type` argument to
-:class:`oslo.config.cfg.Opt` and its subclasses.
+:class:`oslo_config.cfg.Opt` and its subclasses.
 
 """
 import netaddr