x/python-surveilclient
Code Issues Proposed changes

Merge "change import in common/utils for oslo.serialization 1.7"

Browse Source
This commit is contained in:
Jenkins
2015-07-07 14:30:50 +00:00
committed by Gerrit Code Review
parent 12e96bdcb8 0a6e4547ef
commit 88dd4fa13a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
surveilclient/common/utils.py
View File

@@ -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):