diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-12 13:35:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-12 13:35:48 +0000 |
| commit | dfe21d75b8a1dab2d5b8b8910886635801a58f8c (patch) | |
| tree | b484e1933ac89799bcda886df5aab5625905896f | |
| parent | 99f162b1146266a2af21f50a927a99f4e82ef351 (diff) | |
| parent | 1bf09410d191b872b975634f8cf3f8847865b546 (diff) | |
| download | os-client-config-dfe21d75b8a1dab2d5b8b8910886635801a58f8c.tar.gz | |
Merge "Use requestsexceptions for urllib squelching"
| -rw-r--r-- | os_client_config/cloud_config.py | 15 | ||||
| -rw-r--r-- | requirements.txt | 1 |
2 files changed, 4 insertions, 12 deletions
diff --git a/os_client_config/cloud_config.py b/os_client_config/cloud_config.py index af447f1..710bb5e 100644 --- a/os_client_config/cloud_config.py +++ b/os_client_config/cloud_config.py @@ -16,19 +16,11 @@ import warnings from keystoneauth1 import plugin from keystoneauth1 import session +import requestsexceptions from os_client_config import _log from os_client_config import exceptions -# Importing these for later but not disabling for now -try: - from requests.packages.urllib3 import exceptions as urllib_exc -except ImportError: - try: - from urllib3 import exceptions as urllib_exc - except ImportError: - urllib_exc = None - class CloudConfig(object): def __init__(self, name, region, config, @@ -146,13 +138,12 @@ class CloudConfig(object): # Turn off urllib3 warnings about insecure certs if we have # explicitly configured requests to tell it we do not want # cert verification - if not verify and urllib_exc is not None: + if not verify: self.log.debug( "Turning off SSL warnings for {cloud}:{region}" " since verify=False".format( cloud=self.name, region=self.region)) - warnings.filterwarnings( - 'ignore', category=urllib_exc.InsecureRequestWarning) + requestsexceptions.squelch_warnings(insecure_requests=not verify) self._keystone_session = session.Session( auth=self._auth, verify=verify, diff --git a/requirements.txt b/requirements.txt index db0b635..3c32ced 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ PyYAML>=3.1.0 appdirs>=1.3.0 keystoneauth1>=1.0.0 +requestsexceptions>=1.1.1 # Apache-2.0 |