From 1a9a2856579c78feddb7dbe6f803e168bf4a45ce Mon Sep 17 00:00:00 2001 From: Max Claus Nunes Date: Sun, 23 Nov 2014 20:58:35 -0200 Subject: [PATCH 1/2] fixes problem when using environment variables that depends on utf-8 encoding --- docker/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 8bd41ac3..bebabcdb 100644 --- a/docker/client.py +++ b/docker/client.py @@ -109,7 +109,7 @@ class Client(requests.Session): command = shlex.split(str(command)) if isinstance(environment, dict): environment = [ - '{0}={1}'.format(k, v) for k, v in environment.items() + u'{0}={1}'.format(k, v) for k, v in environment.items() ] if isinstance(mem_limit, six.string_types): From 30af5ea80c725d46c37c1ee1c82607646cf11c70 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 26 Nov 2014 23:28:00 +0100 Subject: [PATCH 2/2] Changed unicode literal to explicit typecast (3.2 compat) --- docker/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/client.py b/docker/client.py index 4ba91d16..5ba90038 100644 --- a/docker/client.py +++ b/docker/client.py @@ -109,7 +109,7 @@ class Client(requests.Session): command = shlex.split(str(command)) if isinstance(environment, dict): environment = [ - u'{0}={1}'.format(k, v) for k, v in environment.items() + unicode('{0}={1}').format(k, v) for k, v in environment.items() ] if isinstance(mem_limit, six.string_types):