

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)))")

    if re.match(oslo_namespace_imports, logical_line):
        msg = ("K333: '%s' must be used instead of '%s'.") % (
            logical_line.replace('oslo.', 'oslo_'),
            logical_line)
        yield(0, msg)


def factory(register):
    register(check_oslo_namespace_imports)



import re


def check_oslo_namespace_imports(logical_line, blank_before, filename):
    oslo_namespace_imports = re.compile(
        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'.") % (
            logical_line.replace('oslo.', 'oslo_'),
            logical_line)
        yield(0, msg)


def factory(register):
    register(check_oslo_namespace_imports)

Change hacking check to verify all oslo imports
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

  
  
  import re
  
  
  def check_oslo_namespace_imports(logical_line, blank_before, filename):
      oslo_namespace_imports = re.compile(
+         r"(((from)|(import))\s+oslo\.)|(from\s+oslo\s+import\s+)")
-         r"(((from)|(import))\s+oslo\."
-         "((config)|(serialization)|(utils)|(i18n)))|"
-         "(from\s+oslo\s+import\s+((config)|(serialization)|(utils)|(i18n)))")
  
      if re.match(oslo_namespace_imports, logical_line):
          msg = ("K333: '%s' must be used instead of '%s'.") % (
              logical_line.replace('oslo.', 'oslo_'),
              logical_line)
          yield(0, msg)
  
  
  def factory(register):
      register(check_oslo_namespace_imports)
  
Change hacking check to verify all oslo imports
## Code Before:


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)))")

    if re.match(oslo_namespace_imports, logical_line):
        msg = ("K333: '%s' must be used instead of '%s'.") % (
            logical_line.replace('oslo.', 'oslo_'),
            logical_line)
        yield(0, msg)


def factory(register):
    register(check_oslo_namespace_imports)

## Instruction:
Change hacking check to verify all oslo imports
## Code After:


import re


def check_oslo_namespace_imports(logical_line, blank_before, filename):
    oslo_namespace_imports = re.compile(
        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'.") % (
            logical_line.replace('oslo.', 'oslo_'),
            logical_line)
        yield(0, msg)


def factory(register):
    register(check_oslo_namespace_imports)
