#2787 Revert "requests exception"
Merged 3 years ago by tkopecek. Opened 3 years ago by mikem.
mikem/koji fix-retries  into  master

file modified
-11
@@ -59,7 +59,6 @@ 

  import six.moves.urllib

  from requests.adapters import HTTPAdapter

  from requests.packages.urllib3.util.retry import Retry

- from requests.exceptions import RequestException

  from six.moves import range, zip

  

  from koji.xmlrpcplus import Fault, dumps, getparser, loads, xmlrpc_client
@@ -2743,16 +2742,6 @@ 

                      # (depending on the python version, these may or may not be subclasses of

                      # Exception)

                      raise

-                 except RequestException as e:

-                     _err_res = e.response

-                     _err_req = e.request

-                     if _err_res:

-                         _values = (_err_res.status_code, _err_res.text, str(_err_res))

-                         self.logger.error('Response error: %s::%s::%s' % _values)

-                     else:

-                         _values = (_err_req.method, _err_req.url, str(_err_req))

-                         self.logger.error('Request error: %s::%s::%s' % _values)

-                     raise

                  except Exception as e:

                      tb_str = ''.join(traceback.format_exception(*sys.exc_info()))

                      self.new_session()

Metadata Update from @tkopecek:
- Pull-request tagged with: no_qe

3 years ago

Commit 0d3a330 fixes this pull-request

Pull-Request has been merged by tkopecek

3 years ago
Metadata