From d66e44fa9fd9b8e8944907b2490d32102c3fba82 Mon Sep 17 00:00:00 2001 From: Brant Knudson Date: Sat, 31 Jan 2015 08:06:22 -0600 Subject: [PATCH] Change hacking check to verify all oslo imports The hacking check was verifying that specific oslo imports weren't using the oslo-namespaced package. Since all the oslo libraries used by keystoneclient are now changed to use the new package name the hacking check can be simplified. bp drop-namespace-packages Change-Id: I6466e857c6eda0add6918e9fb14dc9296ed98600 --- keystoneclient/hacking/checks.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/keystoneclient/hacking/checks.py b/keystoneclient/hacking/checks.py index 49458f72e..42826982a 100644 --- a/keystoneclient/hacking/checks.py +++ b/keystoneclient/hacking/checks.py @@ -24,9 +24,7 @@ import re def check_oslo_namespace_imports(logical_line, blank_before, filename): oslo_namespace_imports = re.compile( - r"(((from)|(import))\s+oslo\." - "((config)|(serialization)|(utils)|(i18n)))|" - "(from\s+oslo\s+import\s+((config)|(serialization)|(utils)|(i18n)))") + r"(((from)|(import))\s+oslo\.)|(from\s+oslo\s+import\s+)") if re.match(oslo_namespace_imports, logical_line): msg = ("K333: '%s' must be used instead of '%s'.") % (