From b27fcec5441bf46c914e996afb34a36cef8c7000 Mon Sep 17 00:00:00 2001 From: Mike McLean Date: Sep 23 2017 19:40:08 +0000 Subject: PR#597: use_old_ssl is deprecated Merges #597 https://pagure.io/koji/pull-request/597 Related: #467 https://pagure.io/koji/issue/467 --- diff --git a/koji/__init__.py b/koji/__init__.py index 73a3f9e..0dad3db 100644 --- a/koji/__init__.py +++ b/koji/__init__.py @@ -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 diff --git a/koji/compatrequests.py b/koji/compatrequests.py index d56f0f2..2bd89ac 100644 --- a/koji/compatrequests.py +++ b/koji/compatrequests.py @@ -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):