summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrant Knudson <bknudson@us.ibm.com>2015-01-31 08:06:22 -0600
committerBrant Knudson <bknudson@us.ibm.com>2015-02-09 20:34:49 -0600
commitd66e44fa9fd9b8e8944907b2490d32102c3fba82 (patch)
tree9826e354724451238201ce77f546ea2aca727a64
parent750d5a39dc0febc0e27f288b642f143debef7838 (diff)
downloadpython-keystoneclient-d66e44fa9fd9b8e8944907b2490d32102c3fba82.tar.gz
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
-rw-r--r--keystoneclient/hacking/checks.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/keystoneclient/hacking/checks.py b/keystoneclient/hacking/checks.py
index 49458f7..4282698 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'.") % (