PR#597: use_old_ssl is deprecated

Merges #597
https://pagure.io/koji/pull-request/597

Related: #467
https://pagure.io/koji/issue/467
This commit is contained in:
Mike McLean 2017-09-23 15:40:08 -04:00
commit b27fcec544
2 changed files with 7 additions and 0 deletions

View file

@ -2060,6 +2060,7 @@ class ClientSession(object):
self.rsession = None
self.new_session()
self.opts.setdefault('timeout', 60 * 60 * 12)
self._old_ssl_warning = False
def new_session(self):
@ -2067,6 +2068,10 @@ class ClientSession(object):
if self.rsession:
self.rsession.close()
if self.opts.get('use_old_ssl', False) or requests is None:
if not self._old_ssl_warning:
# only warn once per instance
self.logger.warn('The use_old_ssl option is deprecated')
self._old_ssl_warning = True
if not six.PY2:
raise GenericError('use_old_ssl is only supported on python2')
import koji.compatrequests

View file

@ -12,6 +12,7 @@ import urlparse
import urllib
import sys
import ssl.SSLCommon
from warnings import warn
try:
from ssl import ssl as pyssl
except ImportError: # pragma: no cover
@ -22,6 +23,7 @@ class Session(object):
def __init__(self):
self.connection = None
warn('koji: compatrequests is deprecated', DeprecationWarning)
def post(self, url, data=None, headers=None, stream=None, verify=None,
cert=None, timeout=None):