diff options
author | Joffrey F <f.joffrey@gmail.com> | 2015-10-05 14:26:07 -0700 |
---|---|---|
committer | Joffrey F <f.joffrey@gmail.com> | 2015-10-05 14:26:07 -0700 |
commit | 73e45ef3598dafd2ffbcc2e14b779f2ae0aa761d (patch) | |
tree | a17a4e936c4963576cc0dbc306f1d392a5c00d85 | |
parent | 1c97c691bff2b892c081fc4a68787946ed51f849 (diff) | |
parent | 29219a278bdbcfc15c3891df651ec297e5fb47de (diff) | |
download | docker-py-73e45ef3598dafd2ffbcc2e14b779f2ae0aa761d.tar.gz |
Merge pull request #787 from docker/782-unicode-volume-paths
Don't break when volume binds contain unicode characters
-rw-r--r-- | docker/utils/utils.py | 19 | ||||
-rw-r--r-- | tests/utils_test.py | 91 |
2 files changed, 104 insertions, 6 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py index 36edf8d..1fce137 100644 --- a/docker/utils/utils.py +++ b/docker/utils/utils.py @@ -242,6 +242,9 @@ def convert_volume_binds(binds): result = [] for k, v in binds.items(): + if isinstance(k, six.binary_type): + k = k.decode('utf-8') + if isinstance(v, dict): if 'ro' in v and 'mode' in v: raise ValueError( @@ -249,6 +252,10 @@ def convert_volume_binds(binds): .format(repr(v)) ) + bind = v['bind'] + if isinstance(bind, six.binary_type): + bind = bind.decode('utf-8') + if 'ro' in v: mode = 'ro' if v['ro'] else 'rw' elif 'mode' in v: @@ -256,11 +263,15 @@ def convert_volume_binds(binds): else: mode = 'rw' - result.append('{0}:{1}:{2}'.format( - k, v['bind'], mode - )) + result.append( + six.text_type('{0}:{1}:{2}').format(k, bind, mode) + ) else: - result.append('{0}:{1}:rw'.format(k, v)) + if isinstance(v, six.binary_type): + v = v.decode('utf-8') + result.append( + six.text_type('{0}:{1}:rw').format(k, v) + ) return result diff --git a/tests/utils_test.py b/tests/utils_test.py index 45929f7..8ac1dcb 100644 --- a/tests/utils_test.py +++ b/tests/utils_test.py @@ -1,15 +1,20 @@ +# -*- coding: utf-8 -*- + import os import os.path import shutil import tempfile +import pytest +import six + from docker.client import Client from docker.constants import DEFAULT_DOCKER_API_VERSION from docker.errors import DockerException from docker.utils import ( parse_repository_tag, parse_host, convert_filters, kwargs_from_env, create_host_config, Ulimit, LogConfig, parse_bytes, parse_env_file, - exclude_paths, + exclude_paths, convert_volume_binds, ) from docker.utils.ports import build_port_bindings, split_port from docker.auth import resolve_repository_name, resolve_authconfig @@ -17,7 +22,6 @@ from docker.auth import resolve_repository_name, resolve_authconfig from . import base from .helpers import make_tree -import pytest TEST_CERT_DIR = os.path.join( os.path.dirname(__file__), @@ -192,6 +196,89 @@ class UtilsTest(base.BaseTestCase): local_tempfile.close() return local_tempfile.name + def test_convert_volume_binds_empty(self): + self.assertEqual(convert_volume_binds({}), []) + self.assertEqual(convert_volume_binds([]), []) + + def test_convert_volume_binds_list(self): + data = ['/a:/a:ro', '/b:/c:z'] + self.assertEqual(convert_volume_binds(data), data) + + def test_convert_volume_binds_complete(self): + data = { + '/mnt/vol1': { + 'bind': '/data', + 'mode': 'ro' + } + } + self.assertEqual(convert_volume_binds(data), ['/mnt/vol1:/data:ro']) + + def test_convert_volume_binds_compact(self): + data = { + '/mnt/vol1': '/data' + } + self.assertEqual(convert_volume_binds(data), ['/mnt/vol1:/data:rw']) + + def test_convert_volume_binds_no_mode(self): + data = { + '/mnt/vol1': { + 'bind': '/data' + } + } + self.assertEqual(convert_volume_binds(data), ['/mnt/vol1:/data:rw']) + + def test_convert_volume_binds_unicode_bytes_input(self): + if six.PY2: + expected = [unicode('/mnt/지연:/unicode/박:rw', 'utf-8')] + + data = { + '/mnt/지연': { + 'bind': '/unicode/박', + 'mode': 'rw' + } + } + self.assertEqual( + convert_volume_binds(data), expected + ) + else: + expected = ['/mnt/지연:/unicode/박:rw'] + + data = { + bytes('/mnt/지연', 'utf-8'): { + 'bind': bytes('/unicode/박', 'utf-8'), + 'mode': 'rw' + } + } + self.assertEqual( + convert_volume_binds(data), expected + ) + + def test_convert_volume_binds_unicode_unicode_input(self): + if six.PY2: + expected = [unicode('/mnt/지연:/unicode/박:rw', 'utf-8')] + + data = { + unicode('/mnt/지연', 'utf-8'): { + 'bind': unicode('/unicode/박', 'utf-8'), + 'mode': 'rw' + } + } + self.assertEqual( + convert_volume_binds(data), expected + ) + else: + expected = ['/mnt/지연:/unicode/박:rw'] + + data = { + '/mnt/지연': { + 'bind': '/unicode/박', + 'mode': 'rw' + } + } + self.assertEqual( + convert_volume_binds(data), expected + ) + def test_parse_repository_tag(self): self.assertEqual(parse_repository_tag("root"), ("root", None)) |