Merge lp:~allsymes/software-center/http_proxy into lp:software-center

[Luke Symes]

[Luke Symes (allsymes)]

Enables proxy authentication for those who need it, specifically for downloading packages and screenshots.

[Michael Vogt (mvo)]

Merged (with minor adjustments)

review: Approve

=== modified file 'softwarecenter/backend/aptd.py'
--- softwarecenter/backend/aptd.py	2009-11-04 09:51:35 +0000
+++ softwarecenter/backend/aptd.py	2009-11-07 02:55:18 +0000
@@ -168,7 +168,12 @@
             if client.get_bool("/system/http_proxy/use_http_proxy"):
                 host = client.get_string("/system/http_proxy/host")
                 port = client.get_int("/system/http_proxy/port")
-                transaction.set_http_proxy("http://%s:%s/" % (host, port))
+                authentication = ""
+                if client.get_bool("/system/http_proxy/use_authentication"):
+                    user = client.get_string("/system/http_proxy/authentication_user")
+                    password = client.get_string("/system/http_proxy/authentication_password")
+                    authentication = "%s:%s@" % (user, password)
+                transaction.set_http_proxy("http://%s%s:%s/" % (authentication, host, port))
         except:
             logging.exception("gconf http proxy failed")
 
 
=== modified file 'softwarecenter/view/widgets/imagedialog.py'
--- softwarecenter/view/widgets/imagedialog.py	2009-10-15 16:07:37 +0000
+++ softwarecenter/view/widgets/imagedialog.py	2009-11-07 02:55:18 +0000
@@ -40,9 +40,14 @@
         client = gconf.client_get_default()
         if client.get_bool("/system/http_proxy/use_http_proxy"):
             try:
+                authentication = ""
+                if client.get_bool("/system/http_proxy/use_authentication"):
+                    user = client.get_string("/system/http_proxy/authentication_user")
+                    password = client.get_string("/system/http_proxy/authentication_password")
+                    authentication = "%s:%s@" % (user, password)
                 host = client.get_string("/system/http_proxy/host")
                 port = client.get_int("/system/http_proxy/port")
-                proxies = { "http" : "http://%s:%s/" %  (host, port) }
+                proxies = { "http" : "http://%s%s:%s/" %  (authentication, host, port) }
             except GError, e:
                 pass
         urllib.FancyURLopener.__init__(self, proxies)