summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorJoffrey F <joffrey@docker.com>2015-10-27 18:01:19 +0100
committerJoffrey F <joffrey@docker.com>2015-10-27 18:01:19 +0100
commita610a1be0eaefdfa10b0dc91b0f1e49fc1e93cb2 (patch)
tree14ed44029314365db7e9c437f3978ff1e1e38afd /docker
parent311ae711d49ed28ecef42c806fac7afb8f53ea85 (diff)
downloaddocker-py-a610a1be0eaefdfa10b0dc91b0f1e49fc1e93cb2.tar.gz
Fix py3.2 test failure and unicode behavior
Signed-off-by: Joffrey F <joffrey@docker.com>
Diffstat (limited to 'docker')
-rw-r--r--docker/utils/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/utils/utils.py b/docker/utils/utils.py
index 4d2968a..39d0eba 100644
--- a/docker/utils/utils.py
+++ b/docker/utils/utils.py
@@ -674,7 +674,7 @@ def parse_env_file(env_file):
def split_command(command):
- if six.PY2:
+ if six.PY2 and not isinstance(command, six.binary_type):
command = command.encode('utf-8')
return shlex.split(command)