From 175bcb461365c7e2ac35c703755f90551217e2e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20=C4=8Cerm=C3=A1k?= Date: Fri, 21 Feb 2020 15:09:58 +0100 Subject: [PATCH] Remove compat code for Python < 2.6 --- osc/conf.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/osc/conf.py b/osc/conf.py index 277cc4f8..b1aa4edc 100644 --- a/osc/conf.py +++ b/osc/conf.py @@ -593,14 +593,6 @@ def init_basicauth(config, config_mtime): HTTPConnection.send = filterhdrs(HTTPConnection.send, True, 'Cookie', 'Authorization') HTTPResponse.begin = filterhdrs(HTTPResponse.begin, False, 'header: Set-Cookie.*\n') - if sys.version_info < (2, 6): - # HTTPS proxy is not supported in old urllib2. It only leads to an error - # or, at best, a warning. - if 'https_proxy' in os.environ: - del os.environ['https_proxy'] - if 'HTTPS_PROXY' in os.environ: - del os.environ['HTTPS_PROXY'] - if config['http_debug']: # brute force def urllib2_debug_init(self, debuglevel=0):