Remove six usage murano/contrib
Change-Id: I55cbf3c09aaf60918d5b97b0e8621b47016d0333
This commit is contained in:
parent
f3f2a4019a
commit
035f4e3073
|
@ -12,7 +12,6 @@
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import six
|
|
||||||
import sys
|
import sys
|
||||||
import yaml
|
import yaml
|
||||||
import zipfile
|
import zipfile
|
||||||
|
@ -271,9 +270,9 @@ class CSARPackage(package_base.PackageBase):
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _format_value(value):
|
def _format_value(value):
|
||||||
if isinstance(value, six.string_types):
|
if isinstance(value, str):
|
||||||
return u"{}".format(value)
|
return u"{}".format(value)
|
||||||
return six.text_type(value)
|
return str(value)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def _generate_workflow(csar, files):
|
def _generate_workflow(csar, files):
|
||||||
|
|
Loading…
Reference in New Issue