Merge branch 'drop_old_code' of https://github.com/dcermak/osc

Get rid of python < 2.6 cruft.
openSUSE · Feb 23, 2020 · e89c498 · e89c498
2 parents 20f2f40 + 175bcb4
commit e89c498
Showing 1 changed file with 0 additions and 8 deletions.
diff --git a/osc/conf.py b/osc/conf.py
@@ -593,14 +593,6 @@ def new_method(self, *args, **kwargs):
         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):