Merge branch 'maxcnunes-fix-env-variables-unicode'

2014-11-26 23:28:18 +01:00 · 2014-11-26 23:28:18 +01:00 · 2a90dd2ab5
parent 0012430b1b 30af5ea80c
commit 2a90dd2ab5
1 changed files with 1 additions and 1 deletions
--- 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()
+                unicode('{0}={1}').format(k, v) for k, v in environment.items()
            ]

        if isinstance(mem_limit, six.string_types):