Merge lp:~xnox/system-service/pac-support into lp:system-service

[Dimitri John Ledkov]

[Iain Lane (laney)]

Thanks, but there are conflicts with trunk, please resolve.

review: Needs Fixing

Unmerged revisions

77. By Dimitri John Ledkov on 2014-12-07

Add support for auto_proxy (Proxy auto-config)

76. By Dimitri John Ledkov on 2014-12-07

Clean-up unused imports

75. By Dimitri John Ledkov on 2014-12-07

port system-service-d to python3.

74. By Dimitri John Ledkov on 2013-10-27

Port to python3.

=== modified file 'UbuntuSystemService/backend.py'
--- UbuntuSystemService/backend.py	2014-12-07 02:13:29 +0000
+++ UbuntuSystemService/backend.py	2014-12-07 02:13:29 +0000
@@ -17,7 +17,7 @@
 
     # some class properties
     DBUS_INTERFACE_NAME = "com.ubuntu.SystemService"
-    SUPPORTED_PROXIES = ("http","ftp", "https", "socks")
+    SUPPORTED_PROXIES = ("http","ftp", "https", "socks", "auto")
 
     # default files
     DPKG_LOCK = "/var/lib/dpkg/lock"
@@ -79,6 +79,11 @@
         env_proxy = self._etc_environment_proxy("https")
         return env_proxy
 
+    def _auto_proxy(self):
+        " internal helper that returns the current auto proxy "
+        env_proxy = self._etc_environment_proxy("auto")
+        return env_proxy
+
     def _verify_proxy(self, proxy_type, proxy):
         " internal helper, verify that the proxy string is valid "
         return verify_proxy(proxy_type, proxy)
@@ -99,14 +104,9 @@
         This function will look in the apt configuration to 
         find the current http proxy.
         """
-        if proxy_type == "http":
-            return self._http_proxy()
-        if proxy_type == "https":
-            return self._https_proxy()
-        elif proxy_type == "ftp": 
-            return self._ftp_proxy()
-        elif proxy_type == "socks": 
-            return self._socks_proxy()
+        proxy_method = getattr(self, "_%s_proxy" % proxy_type, False)
+        if proxy_method:
+            return proxy_method()
         raise UnknownProxyTypeError("proxy_type '%s' is unknown in get_proxy" % proxy_type)
 
 

=== modified file 'debian/changelog'
--- debian/changelog	2014-12-07 02:13:29 +0000
+++ debian/changelog	2014-12-07 02:13:29 +0000
@@ -1,8 +1,10 @@
 ubuntu-system-service (0.3.0) UNRELEASED; urgency=low
 
+  [ Dimitri John Ledkov ]
   * Port to python3.
+  * Add support for auto_proxy (Proxy auto-config)
 
- -- Dmitrijs Ledkovs <[e-mail]>  Sun, 27 Oct 2013 01:35:30 +0000
+ -- Dimitri John Ledkov <[e-mail]>  Sun, 27 Oct 2013 01:35:30 +0000
 
 ubuntu-system-service (0.2.5) saucy; urgency=low
 

=== modified file 'test/interactive/test_dbus'
--- test/interactive/test_dbus	2011-10-21 16:48:31 +0000
+++ test/interactive/test_dbus	2014-12-07 02:13:29 +0000
@@ -23,7 +23,7 @@
         self.assertTrue( res in [True, False] )
 
     def test_get_proxy(self):
-        for proto in ["http", "https", "ftp"]:
+        for proto in ["http", "https", "ftp", "auto"]:
             res = self.iface.get_proxy(proto)
             # ensure we get a string
             self.assertTrue( isinstance(res, dbus.String) )