diff --git a/keystoneclient/adapter.py b/keystoneclient/adapter.py index e14ce7df..e8e0a29a 100644 --- a/keystoneclient/adapter.py +++ b/keystoneclient/adapter.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from keystoneclient import utils diff --git a/keystoneclient/hacking/checks.py b/keystoneclient/hacking/checks.py index 8481f80c..df2c9609 100644 --- a/keystoneclient/hacking/checks.py +++ b/keystoneclient/hacking/checks.py @@ -24,8 +24,8 @@ import re def check_oslo_namespace_imports(logical_line, blank_before, filename): oslo_namespace_imports = re.compile( - r"(((from)|(import))\s+oslo\.utils)|" - "(from\s+oslo\s+import\s+utils)") + r"(((from)|(import))\s+oslo\.((serialization)|(utils)))|" + "(from\s+oslo\s+import\s+((serialization)|(utils)))") if re.match(oslo_namespace_imports, logical_line): msg = ("K333: '%s' must be used instead of '%s'.") % ( diff --git a/keystoneclient/session.py b/keystoneclient/session.py index 3ac6d600..b3ae6333 100644 --- a/keystoneclient/session.py +++ b/keystoneclient/session.py @@ -18,7 +18,7 @@ import os import time from oslo.config import cfg -from oslo.serialization import jsonutils +from oslo_serialization import jsonutils from oslo_utils import importutils import requests import six