From 0eedb98a9acbb61219a376a7ece8c672f1319c4c Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 2 Mar 2015 07:58:46 +0100
Subject: [PATCH] Remove hacking exception for oslo.messaging import

olso.messaging moved away from namespace packages so this check is no
longer needed.

Change-Id: I76ac67cf38a22350bdb68351f5bb3f38cb9763c5
---
 manila/hacking/checks.py | 4 +---
 manila/test.py           | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/manila/hacking/checks.py b/manila/hacking/checks.py
index 1281f10c..cc20137f 100644
--- a/manila/hacking/checks.py
+++ b/manila/hacking/checks.py
@@ -52,9 +52,7 @@ string_translation = re.compile(r"[^_]*_\(\s*('|\")")
 underscore_import_check = re.compile(r"(.)*import _(.)*")
 # We need this for cases where they have created their own _ function.
 custom_underscore_check = re.compile(r"(.)*_\s*=\s*(.)*")
-# TODO(toabctl): Remove the oslo.messaging exception when package
-#                moved away from namespace
-oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](?!messaging)(.*)")
+oslo_namespace_imports = re.compile(r"from[\s]*oslo[.](.*)")
 
 
 class BaseASTChecker(ast.NodeVisitor):
diff --git a/manila/test.py b/manila/test.py
index da85d99c..a33ce02f 100644
--- a/manila/test.py
+++ b/manila/test.py
@@ -27,11 +27,11 @@ import uuid
 
 import fixtures
 import mock
-from oslo.messaging import conffixture as messaging_conffixture
 from oslo_concurrency import lockutils
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_log import log
+from oslo_messaging import conffixture as messaging_conffixture
 import oslotest.base as base_test
 import six