Merge "Use oslo_utils instead of deprecated oslo.utils"
This commit is contained in:
		@@ -15,7 +15,7 @@ from keystoneclient.auth.identity import v3 as v3_auth
 | 
				
			|||||||
from keystoneclient import discover
 | 
					from keystoneclient import discover
 | 
				
			||||||
from keystoneclient import exceptions as ks_exc
 | 
					from keystoneclient import exceptions as ks_exc
 | 
				
			||||||
from keystoneclient import session
 | 
					from keystoneclient import session
 | 
				
			||||||
from oslo.utils import strutils
 | 
					from oslo_utils import strutils
 | 
				
			||||||
import six.moves.urllib.parse as urlparse
 | 
					import six.moves.urllib.parse as urlparse
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ceilometerclient.common import utils
 | 
					from ceilometerclient.common import utils
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,8 +20,8 @@ import textwrap
 | 
				
			|||||||
import uuid
 | 
					import uuid
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from oslo.serialization import jsonutils
 | 
					from oslo.serialization import jsonutils
 | 
				
			||||||
from oslo.utils import encodeutils
 | 
					from oslo_utils import encodeutils
 | 
				
			||||||
from oslo.utils import importutils
 | 
					from oslo_utils import importutils
 | 
				
			||||||
import prettytable
 | 
					import prettytable
 | 
				
			||||||
import six
 | 
					import six
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,7 +20,7 @@ import argparse
 | 
				
			|||||||
import logging
 | 
					import logging
 | 
				
			||||||
import sys
 | 
					import sys
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from oslo.utils import encodeutils
 | 
					from oslo_utils import encodeutils
 | 
				
			||||||
import six
 | 
					import six
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import ceilometerclient
 | 
					import ceilometerclient
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,7 +23,7 @@ import functools
 | 
				
			|||||||
import json
 | 
					import json
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from oslo.serialization import jsonutils
 | 
					from oslo.serialization import jsonutils
 | 
				
			||||||
from oslo.utils import strutils
 | 
					from oslo_utils import strutils
 | 
				
			||||||
import six
 | 
					import six
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from ceilometerclient.common import utils
 | 
					from ceilometerclient.common import utils
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user