docker
/
docker-py
mirror of https://github.com/docker/docker-py.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #29 from raphdg/fix_shlex 

Fixed python26 shlex split of unicode strings.
This commit is contained in:
Joffrey F 2013-08-14 07:20:40 -07:00
parent c31ce82d2c 579201bcf7
commit f3ff3925c6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/client.py
View File

@ -34,7 +34,7 @@ class UnixHTTPConnection(httplib.HTTPConnection, object):
def _extract_path(self, url): def _extract_path(self, url):
#remove the base_url entirely.. #remove the base_url entirely..
return url.replace(self.base_url, "") return url.replace(self.base_url, "")
def request(self, method, url, **kwargs): def request(self, method, url, **kwargs):
url = self._extract_path(self.unix_socket) url = self._extract_path(self.unix_socket)
super(UnixHTTPConnection, self).request(method, url, **kwargs) super(UnixHTTPConnection, self).request(method, url, **kwargs)
@ -101,7 +101,7 @@ class Client(requests.Session):
detach=False, stdin_open=False, tty=False, mem_limit=0, ports=None, detach=False, stdin_open=False, tty=False, mem_limit=0, ports=None,
environment=None, dns=None, volumes=None, volumes_from=None): environment=None, dns=None, volumes=None, volumes_from=None):
if isinstance(command, six.string_types): if isinstance(command, six.string_types):
command = shlex.split(command) command = shlex.split(str(command))
return { return {
'Hostname': hostname, 'Hostname': hostname,
'PortSpecs': ports, 'PortSpecs': ports,