From 9b8248fdac20072b966b418ce68497aa54c878d1 Mon Sep 17 00:00:00 2001 From: Jakub Libosvar Date: Mon, 24 Feb 2014 09:37:11 +0100 Subject: [PATCH] Sync oslo cache with oslo-incubator Due to removal of py3kcompat we need to sync with oslo-incubator in order to use six package directly. Related-Bug: #1276440 Change-Id: Ib3d1c9e09497f7ecd7495ef0f70c6105c14a9783 --- neutron/openstack/common/cache/cache.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/neutron/openstack/common/cache/cache.py b/neutron/openstack/common/cache/cache.py index f8f8393bf..1247787a2 100644 --- a/neutron/openstack/common/cache/cache.py +++ b/neutron/openstack/common/cache/cache.py @@ -20,10 +20,9 @@ Supported configuration options: `key_namespace`: Namespace under which keys will be created. """ +from six.moves.urllib import parse from stevedore import driver -from neutron.openstack.common.py3kcompat import urlutils - def _get_olso_configs(): """Returns the oslo.config options to register.""" @@ -58,7 +57,7 @@ def get_cache(url='memory://'): :param conf: Configuration instance to use """ - parsed = urlutils.urlparse(url) + parsed = parse.urlparse(url) backend = parsed.scheme query = parsed.query @@ -69,7 +68,7 @@ def get_cache(url='memory://'): # http://hg.python.org/cpython/rev/79e6ff3d9afd if not query and '?' in parsed.path: query = parsed.path.split('?', 1)[-1] - parameters = urlutils.parse_qsl(query) + parameters = parse.parse_qsl(query) kwargs = {'options': dict(parameters)} mgr = driver.DriverManager('neutron.openstack.common.cache.backends', backend, -- 2.45.2