Remove six usage
Change-Id: Ic6865589c1265185cb22d4caa197b3293fe50465
This commit is contained in:
parent
ce7f13fc24
commit
b6d544c27f
|
@ -13,6 +13,7 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import collections
|
import collections
|
||||||
|
from io import BytesIO
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import tempfile
|
import tempfile
|
||||||
|
@ -23,8 +24,7 @@ import zipfile
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import requests
|
import requests
|
||||||
import six
|
import urllib
|
||||||
from six.moves import urllib
|
|
||||||
|
|
||||||
LOG = logging.getLogger(__name__)
|
LOG = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
@ -285,7 +285,7 @@ class Package(FileWrapperMixin):
|
||||||
try:
|
try:
|
||||||
self._file.seek(0)
|
self._file.seek(0)
|
||||||
self._zip_obj = zipfile.ZipFile(
|
self._zip_obj = zipfile.ZipFile(
|
||||||
six.BytesIO(self._file.read()))
|
BytesIO(self._file.read()))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
LOG.error("Error {0} occurred,"
|
LOG.error("Error {0} occurred,"
|
||||||
" while parsing the package".format(e))
|
" while parsing the package".format(e))
|
||||||
|
@ -372,7 +372,7 @@ class Package(FileWrapperMixin):
|
||||||
|
|
||||||
def transpose_graph(graph):
|
def transpose_graph(graph):
|
||||||
transposed = collections.defaultdict(list)
|
transposed = collections.defaultdict(list)
|
||||||
for node, deps in six.viewitems(graph):
|
for node, deps in graph.items():
|
||||||
for dep in deps:
|
for dep in deps:
|
||||||
transposed[dep].append(node)
|
transposed[dep].append(node)
|
||||||
return transposed
|
return transposed
|
||||||
|
|
|
@ -4,7 +4,6 @@
|
||||||
|
|
||||||
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
pbr!=2.1.0,>=2.0.0 # Apache-2.0
|
||||||
oslo.config>=5.2.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.serialization!=2.19.1,>=2.18.0 # Apache-2.0
|
||||||
oslo.utils>=3.33.0 # Apache-2.0
|
oslo.utils>=3.33.0 # Apache-2.0
|
||||||
testtools>=2.2.0 # MIT
|
testtools>=2.2.0 # MIT
|
||||||
|
|
Loading…
Reference in New Issue