From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 20 Apr 2021 13:14:51 +0000 (+0000)
Subject: http: Drop dependency on configuration
X-Git-Tag: 0.9.28~1285^2~294
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a024d66d620a0257b26b7f3fad8fa947ace1e062;p=pakfire.git

http: Drop dependency on configuration

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/pakfire/config.py b/src/pakfire/config.py
index d6eefcbae..912e16642 100644
--- a/src/pakfire/config.py
+++ b/src/pakfire/config.py
@@ -73,7 +73,3 @@ class Config(object):
 
 	def get_bool(self, section, option, default=None):
 		return self._config.getboolean(section, option, fallback=default)
-
-
-# Read initial configuration
-config = Config("general.conf")
diff --git a/src/pakfire/http.py b/src/pakfire/http.py
index c77bd3aae..89207eea9 100644
--- a/src/pakfire/http.py
+++ b/src/pakfire/http.py
@@ -34,7 +34,6 @@ import urllib.request
 
 from .ui import progressbar
 
-from .config import config
 from .i18n import _
 from . import errors
 
@@ -72,17 +71,6 @@ class Client(object):
 		# Create an SSL context to HTTPS connections
 		self.ssl_context = ssl.create_default_context()
 
-		# Configure upstream proxies
-		proxy = config.get("downloader", "proxy")
-		if proxy:
-			for protocol in ("http", "https", "ftp"):
-				self.set_proxy(protocol, proxy)
-
-		# Should we verify SSL certificates?
-		verify = config.get_bool("downloader", "verify", True)
-		if not verify:
-			self.disable_certificate_verification()
-
 		# Add the baseurl as mirror with worst priority
 		if self.baseurl:
 			self.add_mirror(self.baseurl, priority=999)