Merge "Replace unicode with six.text_type"

This commit is contained in:
Jenkins
2017-07-10 03:31:38 +00:00
committed by Gerrit Code Review

View File

@@ -234,8 +234,8 @@ class DockerDriver(driver.ComputeDriver):
self._stop_firewall(instance, network_info)
def _encode_utf8(self, value):
if six.PY2 and not isinstance(value, unicode):
value = unicode(value)
if six.PY2 and not isinstance(value, six.text_type):
value = six.text_type(value)
return value.encode('utf-8')
def _find_container_by_instance(self, instance):