Merge lp:~xnox/system-service/python3 into lp:system-service

[Dimitri John Ledkov]

[Martin Pitt (pitti)]

LGTM, except this bit:

65 - print (model, layout, variant, options)
66 + print((model, layout, variant, options))

which I assume is an overzealous 2to3 artifact. I'll revert that, and otherwise upload. Thanks!

review: Approve

[Martin Pitt (pitti)]

Ignore me, it was actually printing a tuple in the 2.x version as well, so this is fine.

[Martin Pitt (pitti)]

I tested this with trying to set a proxy in control-center's Network tab, and applying system-wide. This stopped working with this branch.

$ sudo /usr/lib/system-service/system-service-d
Traceback (most recent call last):
  File "/usr/lib/system-service/system-service-d", line 22, in <module>
    from UbuntuSystemService.backend import ServiceBackend
ImportError: No module named UbuntuSystemService.backend

Seems you forgot to update the shebangs?

review: Needs Fixing

[Dimitri John Ledkov (xnox)]

Yeap, forgot to port the wrapper script that launches the service. Now ported that and checked that it operates without crash / tracebacks.

[Martin Pitt (pitti)]

Didn't test again, but this looks good now, thank you!

review: Approve

Unmerged revisions

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	2011-11-30 12:22:10 +0000
+++ UbuntuSystemService/backend.py	2014-12-07 01:38:31 +0000
@@ -1,11 +1,8 @@
-import sys
-import gobject
 import dbus
 import dbus.service
 import dbus.mainloop.glib
 dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)  
 import os
-import subprocess
 import apt_pkg
 import struct
 import fcntl
@@ -110,7 +107,7 @@
             return self._ftp_proxy()
         elif proxy_type == "socks": 
             return self._socks_proxy()
-        raise UnknownProxyTypeError, "proxy_type '%s' is unknown in get_proxy" % proxy_type
+        raise UnknownProxyTypeError("proxy_type '%s' is unknown in get_proxy" % proxy_type)
 
 
     def _write_apt_proxy(self, proxy_type, new_proxy):
@@ -219,11 +216,11 @@
                                  "com.ubuntu.systemservice.setproxy"):
             if not authWithPolicyKit(sender, conn,
                                      "org.gnome.gconf.defaults.set-system"):
-                raise PermissionDeniedError, "Permission denied by policy"
+                raise PermissionDeniedError("Permission denied by policy")
         
         # check if something supported is set
         if not proxy_type in self.SUPPORTED_PROXIES:
-            raise UnknownProxyTypeError, "proxy_type '%s' is unknown in set_proxy" % proxy_type
+            raise UnknownProxyTypeError("proxy_type '%s' is unknown in set_proxy" % proxy_type)
         
         # set (or reset)
         if new_proxy == "" or new_proxy is None:
@@ -281,7 +278,7 @@
                                  "com.ubuntu.systemservice.setnoproxy"):
             if not authWithPolicyKit(sender, conn,
                                      "org.gnome.gconf.defaults.set-system"):
-                raise PermissionDeniedError, "Permission denied by policy"
+                raise PermissionDeniedError("Permission denied by policy")
         
         # set (or reset)
         if new_no_proxy == "" or new_no_proxy is None:
@@ -327,11 +324,11 @@
             if not authWithPolicyKit(sender, conn,
                                      "org.gnome.gconf.defaults.set-system"):
 
-                raise PermissionDeniedError, "Permission denied by policy"
+                raise PermissionDeniedError("Permission denied by policy")
         
         # apply
         if not set_keyboard_to_etc(model, layout, variant, options):
-            print "could not write keyboard to /etc"
+            print("could not write keyboard to /etc")
             return False
         return True
 
@@ -384,5 +381,5 @@
         #print "set_keyboard: ", model, layout, variant, options
         if not authWithPolicyKit(sender, conn, 
                                  "com.ubuntu.systemservice.ispkgsystemlocked"):
-            raise PermissionDeniedError, "Permission denied by policy"
+            raise PermissionDeniedError("Permission denied by policy")
         return self._is_package_system_locked()

=== modified file 'UbuntuSystemService/utils.py'
--- UbuntuSystemService/utils.py	2013-09-18 17:57:15 +0000
+++ UbuntuSystemService/utils.py	2014-12-07 01:38:31 +0000
@@ -59,9 +59,9 @@
                 options = line.split("=")[1].strip('"\n')
 
         f.close()
-        print (model, layout, variant, options)
+        print((model, layout, variant, options))
     except Exception:
-        print "Couldn't read ", CONSOLE_SETUP_DEFAULT
+        print("Couldn't read ", CONSOLE_SETUP_DEFAULT)
 
     return (model, layout, variant, options)
 
@@ -93,7 +93,7 @@
     # verify the settings
     if not verify_keyboard_settings(model, layout, variant, options):
         #print "verify_keyboard failed"
-        raise InvalidKeyboardTypeError, "Invalid keyboard set"
+        raise InvalidKeyboardTypeError("Invalid keyboard set")
 
     # FIXME: what to do if not os.path.exists(CONSOLE_SETUP_DEFAULT)
     content = []

=== modified file 'backend/system-service-d'
--- backend/system-service-d	2013-03-26 20:32:13 +0000
+++ backend/system-service-d	2014-12-07 01:38:31 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 # (c) 2008 Canonical Ltd.
 #
@@ -17,12 +17,12 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 import dbus
-import gobject
+from gi.repository import GLib
 
 from UbuntuSystemService.backend import ServiceBackend
 
 if __name__ == "__main__":
     dbus.mainloop.glib.DBusGMainLoop(set_as_default=True) 
     server = ServiceBackend()
-    gobject.MainLoop().run()
-
+    loop = GLib.MainLoop()
+    loop.run()

=== modified file 'debian/changelog'
--- debian/changelog	2013-09-18 17:57:15 +0000
+++ debian/changelog	2014-12-07 01:38:31 +0000
@@ -1,3 +1,9 @@
+ubuntu-system-service (0.3.0) UNRELEASED; urgency=low
+
+  * Port to python3.
+
+ -- Dmitrijs Ledkovs <[e-mail]>  Sun, 27 Oct 2013 01:35:30 +0000
+
 ubuntu-system-service (0.2.5) saucy; urgency=low
 
   * SECURITY UPDATE: possible privilege escalation via policykit UID lookup

=== modified file 'debian/compat'
--- debian/compat	2011-06-10 06:50:04 +0000
+++ debian/compat	2014-12-07 01:38:31 +0000
@@ -1,1 +1,1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2013-03-26 20:32:13 +0000
+++ debian/control	2014-12-07 01:38:31 +0000
@@ -4,20 +4,21 @@
 Maintainer: Michael Vogt <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50~),
                dh-translations,
-               python-distutils-extra,
-               python (>= 2.6.6-3~),
+               python3-distutils-extra,
+               python3 (>= 2.6.6-3~),
+	       dh-python,
                intltool
-X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
 Standards-Version: 3.9.2
 Vcs-Bzr: lp:system-service
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/system-service/ubuntu
 
 Package: ubuntu-system-service
 Architecture: all
-Depends: ${python:Depends},
+Depends: ${python3:Depends},
          ${misc:Depends},
-         python-apt (>= 0.7.0),
-	 python-dbus,
+         python3-apt (>= 0.7.0),
+	 python3-dbus,
 	 policykit-1
 Breaks: gnome-settings-daemon (<< 3.6.4-0ubuntu8),
         indicator-datetime (<< 12.10.3daily13.03.07)

=== modified file 'debian/rules'
--- debian/rules	2011-06-10 06:50:04 +0000
+++ debian/rules	2014-12-07 01:38:31 +0000
@@ -1,4 +1,4 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with translations,python2
+	dh "$@" --with translations,python3 --buildsystem=pybuild

=== modified file 'setup.py'
--- setup.py	2013-03-26 20:32:13 +0000
+++ setup.py	2014-12-07 01:38:31 +0000
@@ -1,8 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
-from distutils.core import setup, Extension
-import glob
-import os
+from distutils.core import setup
 from DistUtilsExtra.command import *
 
 setup(name='system-service',