From daa3a1e2ef3ea43f034af6ca665442247f65ae1e Mon Sep 17 00:00:00 2001 From: Ulises Reyes Date: Sat, 14 Dec 2013 22:28:45 -0500 Subject: [PATCH] Shortened lines --- docker/client.py | 10 +++++----- tests/integration_test.py | 3 ++- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docker/client.py b/docker/client.py index 68088d89..5b90f249 100644 --- a/docker/client.py +++ b/docker/client.py @@ -540,13 +540,13 @@ class Client(requests.Session): self._raise_for_status(res) json_ = res.json() s_port = str(private_port) - host_port_bindings = None + h_ports = None - host_port_bindings = json_['NetworkSettings']['Ports'].get(s_port +'/udp') - if host_port_bindings is None: - host_port_bindings = json_['NetworkSettings']['Ports'].get(s_port + '/tcp') + h_ports = json_['NetworkSettings']['Ports'].get(s_port + '/udp') + if h_ports is None: + h_ports = json_['NetworkSettings']['Ports'].get(s_port + '/tcp') - return host_port_bindings + return h_ports def pull(self, repository, tag=None, stream=False): registry, repo_name = auth.resolve_repository_name(repository) diff --git a/tests/integration_test.py b/tests/integration_test.py index 694005bb..4da31642 100644 --- a/tests/integration_test.py +++ b/tests/integration_test.py @@ -405,7 +405,8 @@ class TestKillWithSignal(BaseTestCase): class TestPort(BaseTestCase): def runTest(self): - container = self.client.create_container('busybox', ['sleep', '9999'], ports=[1111, 2222]) + container = self.client.create_container('busybox', ['sleep', '9999'], + ports=[1111, 2222]) id = container['Id'] self.client.start(container, port_bindings={ 1111: ('127.0.0.1', 4567),