aboutsummaryrefslogtreecommitdiff
path: root/test/test_connectionpool.py
diff options
context:
space:
mode:
authorSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:31 -0700
committerSVN-Git Migration <python-modules-team@lists.alioth.debian.org>2015-10-08 13:19:31 -0700
commit77245469d4fbd400c6702cde35f9d9002540663e (patch)
tree5bbc97fd683f8f7354204d24be7974b268b19531 /test/test_connectionpool.py
parent0c183b9d52b45bac22a2ff9db0e6348b655f4ab2 (diff)
downloadpython-urllib3-77245469d4fbd400c6702cde35f9d9002540663e.tar
python-urllib3-77245469d4fbd400c6702cde35f9d9002540663e.tar.gz
Imported Upstream version 1.3
Diffstat (limited to 'test/test_connectionpool.py')
-rw-r--r--test/test_connectionpool.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/test/test_connectionpool.py b/test/test_connectionpool.py
index 4281d42..c32c6dc 100644
--- a/test/test_connectionpool.py
+++ b/test/test_connectionpool.py
@@ -1,11 +1,7 @@
import unittest
-from urllib3.connectionpool import (
- connection_from_url,
- get_host,
- HTTPConnectionPool,
- make_headers)
-
+from urllib3.connectionpool import connection_from_url, HTTPConnectionPool
+from urllib3.util import get_host, make_headers
from urllib3.exceptions import EmptyPoolError, LocationParseError
@@ -105,7 +101,7 @@ class TestConnectionPool(unittest.TestCase):
pass
try:
- pool.get_url('/', pool_timeout=0.01)
+ pool.request('GET', '/', pool_timeout=0.01)
self.fail("Managed to get a connection without EmptyPoolError")
except EmptyPoolError:
pass