summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGustavo Picon <tabo@tabo.pe>2015-01-26 01:18:14 -0500
committerGustavo Picon <tabo@tabo.pe>2015-01-26 01:18:14 -0500
commit9afb7dfde8d35756ba48070df3785ea6581bf28e (patch)
tree97b2731771fac3997402cbf683f1deb0140935e2
parentc327da6242539aa48bfa8d89bb82d4f47a223ede (diff)
downloadcherrypy-9afb7dfde8d35756ba48070df3785ea6581bf28e.tar.gz
Fixed test_conn importing httplib, failing in Python3
-rw-r--r--cherrypy/test/test_conn.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/cherrypy/test/test_conn.py b/cherrypy/test/test_conn.py
index 502a3ab3..ab830f3c 100644
--- a/cherrypy/test/test_conn.py
+++ b/cherrypy/test/test_conn.py
@@ -1,6 +1,5 @@
"""Tests for TCP connection handling, including proper and timely close."""
-import httplib
import socket
import sys
import time
@@ -802,7 +801,7 @@ class LimitedRequestQueueTests(helper.CPWebCase):
else:
raise AssertionError("Overflow conn did not get RST. "
"Got %s instead" % repr(exc.args))
- except httplib.BadStatusLine:
+ except BadStatusLine:
# This is a special case in OS X. Linux and Windows will
# RST correctly.
assert sys.platform == 'darwin'