Fix up clients for ConnectionPool acquire/release function rename.

ArchiveTeam · Mar 7, 2015 · 5920f13 · 5920f13
1 parent faafb74
commit 5920f13
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/wpull/abstract/client.py b/wpull/abstract/client.py
@@ -118,7 +118,7 @@ def recycle(self):
         '''
 
     @trollius.coroutine
-    def _check_out_connection(self, request):
+    def _acquire_connection(self, request):
         '''Return a connection.'''
         self._request = request
         host = request.url_info.hostname
@@ -127,13 +127,13 @@ def _check_out_connection(self, request):
 
         if self._proxy_adapter:
             connection = yield From(
-                self._proxy_adapter.check_out(self._connection_pool))
+                self._proxy_adapter.acquire(self._connection_pool))
 
             yield From(self._proxy_adapter.connect(
                 self._connection_pool, connection, (host, port), ssl))
         else:
             connection = yield From(
-                self._connection_pool.check_out(host, port, ssl))
+                self._connection_pool.acquire(host, port, ssl))
 
         self._connection = connection
 

diff --git a/wpull/ftp/client.py b/wpull/ftp/client.py
@@ -58,7 +58,7 @@ def _init_stream(self):
         '''
         assert not self._connection
         self._connection = yield From(
-            self._connection_pool.check_out(
+            self._connection_pool.acquire(
                 self._request.url_info.hostname, self._request.url_info.port
             ))
         self._control_stream = ControlStream(self._connection)
@@ -324,7 +324,7 @@ def _open_data_stream(self):
         @trollius.coroutine
         def connection_factory(address):
             self._data_connection = yield From(
-                self._connection_pool.check_out(address[0], address[1]))
+                self._connection_pool.acquire(address[0], address[1]))
             raise Return(self._data_connection)
 
         self._data_stream = yield From(self._commander.setup_data_stream(
@@ -368,12 +368,12 @@ def recycle(self):
                     self._response, connection_closed=self._connection.closed()
                 )
 
-            self._connection_pool.check_in(self._connection)
+            self._connection_pool.no_wait_release(self._connection)
 
     def _close_data_connection(self):
         if self._data_connection:
             self._data_connection.close()
-            self._connection_pool.check_in(self._data_connection)
+            self._connection_pool.no_wait_release(self._data_connection)
             self._data_connection = None
 
         if self._data_stream:

diff --git a/wpull/http/client.py b/wpull/http/client.py
@@ -62,7 +62,7 @@ def fetch(self, request):
         assert not self._connection
         _logger.debug(__('Client fetch request {0}.', request))
 
-        connection = yield From(self._check_out_connection(request))
+        connection = yield From(self._acquire_connection(request))
 
         if self._proxy_adapter:
             self._proxy_adapter.add_auth_header(request)
@@ -176,4 +176,4 @@ def recycle(self):
             self.abort()
 
         if self._connection:
-            self._connection_pool.check_in(self._connection)
+            self._connection_pool.no_wait_release(self._connection)