Remove broken try/except workaround for old requests

Not only is this code broken on the requests we require on
distro-provided requests, it's not needed anymore. Remove it.

Closes-bug: 1526254

Change-Id: I47a07bf9910f118392785fc20e015f036a2e8a7c
This commit is contained in:
Monty Taylor 2015-12-14 15:22:52 -05:00 committed by Stuart McLaren
parent 96f62fe7a0
commit 9bc0018eda
1 changed files with 1 additions and 5 deletions

View File

@ -22,10 +22,6 @@ from keystoneclient import exceptions as ksc_exc
from oslo_utils import importutils
from oslo_utils import netutils
import requests
try:
ProtocolError = requests.packages.urllib3.exceptions.ProtocolError
except ImportError:
ProtocolError = requests.exceptions.ConnectionError
import six
from six.moves.urllib import parse
import warnings
@ -260,7 +256,7 @@ class HTTPClient(_BaseHTTPClient):
message = ("Error communicating with %(url)s: %(e)s" %
dict(url=conn_url, e=e))
raise exc.InvalidEndpoint(message=message)
except (requests.exceptions.ConnectionError, ProtocolError) as e:
except requests.exceptions.ConnectionError as e:
message = ("Error finding address for %(url)s: %(e)s" %
dict(url=conn_url, e=e))
raise exc.CommunicationError(message=message)