diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-07-15 19:06:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-07-15 19:06:13 +0000 |
| commit | abadac0567cf8b1ceaf00edf0648225befc578a3 (patch) | |
| tree | dc24ce67a342ac7ce4f396f694bbe49f64580131 /openstack/common | |
| parent | 0797ad85e273f45bef7e4089135e88e3401d9405 (diff) | |
| parent | 57821de9eab66344d14b45e5a14f2e52a23af8be (diff) | |
| download | oslo-abadac0567cf8b1ceaf00edf0648225befc578a3.tar.gz oslo-abadac0567cf8b1ceaf00edf0648225befc578a3.tar.xz oslo-abadac0567cf8b1ceaf00edf0648225befc578a3.zip | |
Merge "pep8 cleanup in the plugin code"
Diffstat (limited to 'openstack/common')
| -rw-r--r-- | openstack/common/plugin/callbackplugin.py | 2 | ||||
| -rw-r--r-- | openstack/common/plugin/pluginmanager.py | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/openstack/common/plugin/callbackplugin.py b/openstack/common/plugin/callbackplugin.py index bb56a40..bddd796 100644 --- a/openstack/common/plugin/callbackplugin.py +++ b/openstack/common/plugin/callbackplugin.py @@ -13,8 +13,8 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.common.plugin import plugin from openstack.common import log as logging +from openstack.common.plugin import plugin LOG = logging.getLogger(__name__) diff --git a/openstack/common/plugin/pluginmanager.py b/openstack/common/plugin/pluginmanager.py index 0095135..2e3d497 100644 --- a/openstack/common/plugin/pluginmanager.py +++ b/openstack/common/plugin/pluginmanager.py @@ -57,7 +57,8 @@ class PluginManager(object): if not hasattr(CONF, "list_notifier_drivers"): CONF.list_notifier_drivers = [] old_notifier = CONF.notification_driver - CONF.notification_driver = 'openstack.common.notifier.list_notifier' + drvstring = 'openstack.common.notifier.list_notifier' + CONF.notification_driver = drvstring if (old_notifier and old_notifier != 'openstack.common.notifier.list_notifier'): list_notifier.add_driver(old_notifier) |