From fa9f4f663c36b0824406036445e5cff0a78174e9 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 11 Apr 2020 20:31:31 -0400 Subject: [PATCH] test: Remove python 3.4 workaround --- test/functional/test_framework/authproxy.py | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/test/functional/test_framework/authproxy.py b/test/functional/test_framework/authproxy.py index 4ba6ac1db20..c7837d3f6f0 100644 --- a/test/functional/test_framework/authproxy.py +++ b/test/functional/test_framework/authproxy.py @@ -105,16 +105,9 @@ class AuthServiceProxy(): try: self.__conn.request(method, path, postdata, headers) return self._get_response() - except http.client.BadStatusLine as e: - if e.line == "''": # if connection was closed, try again - self.__conn.close() - self.__conn.request(method, path, postdata, headers) - return self._get_response() - else: - raise except (BrokenPipeError, ConnectionResetError): - # Python 3.5+ raises BrokenPipeError instead of BadStatusLine when the connection was reset - # ConnectionResetError happens on FreeBSD with Python 3.4 + # Python 3.5+ raises BrokenPipeError when the connection was reset + # ConnectionResetError happens on FreeBSD self.__conn.close() self.__conn.request(method, path, postdata, headers) return self._get_response()