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 d6eefcbaeec0837d05e0494dae22118aeda99e19..912e16642f437a53e2a452a09dfbc094ed56e89d 100644 (file)
--- 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 c77bd3aaefa12ed44f1b5434c187e1e101c93bf0..89207eea9b3f9f2562ff38d86658cc055ca2ff29 100644 (file)
--- 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)