From b6d544c27f04dd961150c1e571e8a46b45af4166 Mon Sep 17 00:00:00 2001 From: zhurong Date: Thu, 16 Apr 2020 02:32:26 -0700 Subject: [PATCH] Remove six usage Change-Id: Ic6865589c1265185cb22d4caa197b3293fe50465 --- murano_tempest_tests/utils.py | 8 ++++---- requirements.txt | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/murano_tempest_tests/utils.py b/murano_tempest_tests/utils.py index 79d628d..b3a64fc 100644 --- a/murano_tempest_tests/utils.py +++ b/murano_tempest_tests/utils.py @@ -13,6 +13,7 @@ # under the License. import collections +from io import BytesIO import os import shutil import tempfile @@ -23,8 +24,7 @@ import zipfile from oslo_log import log as logging import requests -import six -from six.moves import urllib +import urllib LOG = logging.getLogger(__name__) @@ -285,7 +285,7 @@ class Package(FileWrapperMixin): try: self._file.seek(0) self._zip_obj = zipfile.ZipFile( - six.BytesIO(self._file.read())) + BytesIO(self._file.read())) except Exception as e: LOG.error("Error {0} occurred," " while parsing the package".format(e)) @@ -372,7 +372,7 @@ class Package(FileWrapperMixin): def transpose_graph(graph): transposed = collections.defaultdict(list) - for node, deps in six.viewitems(graph): + for node, deps in graph.items(): for dep in deps: transposed[dep].append(node) return transposed diff --git a/requirements.txt b/requirements.txt index 21d35d8..d9a635c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 -six>=1.10.0 # MIT oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 oslo.utils>=3.33.0 # Apache-2.0 testtools>=2.2.0 # MIT