summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSun Austin <austin.sun@intel.com>2018-12-28 16:33:35 +0800
committerAustin Sun <austin.sun@intel.com>2019-01-15 00:33:13 +0000
commitbb65ec36e69d1a32b037017b8d5a27320a4911c1 (patch)
tree03e3d121eae9436e6edc0dbf513b11c6f9819429
parent7d306ed822f617af080b63633f9792a7b5ccaf50 (diff)
FIX: module rename issue for Python 2/3 compatible code
import six.moves to fix rename of urlparse and Queue Change-Id: Iee1b6053e4c1a174c40cfa858bf62557d308194a Story: 2004585 Task: 28446 Signed-off-by: Sun Austin <austin.sun@intel.com>
Notes
Notes (review): Code-Review+2: Bart Wensley <barton.wensley@windriver.com> Code-Review+2: John Kung <john.kung@windriver.com> Workflow+1: John Kung <john.kung@windriver.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Fri, 18 Jan 2019 14:53:15 +0000 Reviewed-on: https://review.openstack.org/629404 Project: openstack/stx-distcloud Branch: refs/heads/master
-rw-r--r--dcorch/api/proxy/common/utils.py2
-rw-r--r--dcorch/engine/quota_manager.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/dcorch/api/proxy/common/utils.py b/dcorch/api/proxy/common/utils.py
index 666316e..6f13a5c 100644
--- a/dcorch/api/proxy/common/utils.py
+++ b/dcorch/api/proxy/common/utils.py
@@ -15,7 +15,7 @@
15 15
16from dcorch.common import consts 16from dcorch.common import consts
17from oslo_log import log as logging 17from oslo_log import log as logging
18from urlparse import urlparse 18from six.moves.urllib.parse import urlparse
19 19
20LOG = logging.getLogger(__name__) 20LOG = logging.getLogger(__name__)
21 21
diff --git a/dcorch/engine/quota_manager.py b/dcorch/engine/quota_manager.py
index b1d1dfd..f3939de 100644
--- a/dcorch/engine/quota_manager.py
+++ b/dcorch/engine/quota_manager.py
@@ -15,8 +15,8 @@
15 15
16import collections 16import collections
17import copy 17import copy
18from Queue import Queue
19import re 18import re
19from six.moves.queue import Queue
20import threading 20import threading
21import time 21import time
22 22