From 0a6e4547efaa43c7fade7ace8102df5ec0c13ac8 Mon Sep 17 00:00:00 2001 From: flavien peyre Date: Tue, 7 Jul 2015 10:02:57 -0400 Subject: [PATCH] change import in common/utils for oslo.serialization 1.7 Change-Id: Iafa38e623054b32045e5cfbc72bb132fd550a29c --- surveilclient/common/utils.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/surveilclient/common/utils.py b/surveilclient/common/utils.py index fb39f81..a892108 100644 --- a/surveilclient/common/utils.py +++ b/surveilclient/common/utils.py @@ -17,8 +17,10 @@ import os import prettytable from surveilclient.openstack.common import importutils -from oslo.serialization import jsonutils - +try: + from oslo_serialization import jsonutils +except ImportError: + from oslo.serialization import jsonutils # Decorator for cli-args def arg(*args, **kwargs):