Merge lp:~bryanquigley/light-locker-settings/light-locker-settings into lp:light-locker-settings

[Bryan Quigley]

Simple Python3 port

=== modified file 'configure'
--- configure	2015-01-20 03:03:23 +0000
+++ configure	2015-06-16 15:16:34 +0000
@@ -3,7 +3,7 @@
 APPNAME=light-locker-settings
 VERSION=1.5.0
 
-PYTHON=python
+PYTHON=python3
 
 help () {
     echo "Supported options are:"

=== modified file 'debian/control'
--- debian/control	2014-08-17 10:49:38 +0000
+++ debian/control	2015-06-16 15:16:34 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Sean Davis <[e-mail]>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), 
- python-distutils-extra (>= 2.10)
+Build-Depends: debhelper (>= 9), python3 (>= 3.4), 
+ python3-distutils-extra (>= 2.10)
 Standards-Version: 3.9.5
 X-Python-Version: >= 2.6
 Homepage: https://launchpad.net/light-locker-settings
@@ -15,7 +15,7 @@
  ${misc:Depends}, 
  gir1.2-glib-2.0,
  gir1.2-gtk-3.0,
- python-psutil,
+ python3-psutil,
  light-locker (>= 1.4.0)
 Description: simple configuration tool for light-locker
  light-locker-settings is a simple configuration utility that allows you 

=== modified file 'light-locker-settings/light-locker-settings.py'
--- light-locker-settings/light-locker-settings.py	2015-01-14 02:59:51 +0000
+++ light-locker-settings/light-locker-settings.py	2015-06-16 15:16:34 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #   Light Locker Settings - simple configuration tool for light-locker
 #   Copyright (C) 2014 Thomas Molloy <[e-mail]>
@@ -357,7 +357,7 @@
         keyfile.load_from_dirs(filename, dirs,
                                GLib.KeyFileFlags.KEEP_TRANSLATIONS)
 
-        for key in defaults.keys():
+        for key in list(defaults.keys()):
             try:
                 if keyfile.get_value("Desktop Entry", key) is None:
                     keyfile.set_value("Desktop Entry", key, defaults[key])
@@ -456,7 +456,7 @@
             settings['lock-on-suspend'] = xfpm_sync.get_lock()
 
         # Check if any known screensaver managers are currently running.
-        for process_name in screensaver_managers.keys():
+        for process_name in list(screensaver_managers.keys()):
             if self.check_running_process(process_name):
                 name, command = screensaver_managers[process_name]
                 self.use_screensaver_manager(name, command)

=== modified file 'light-locker-settings/light_locker_xfsync.py'
--- light-locker-settings/light_locker_xfsync.py	2014-09-25 21:57:49 +0000
+++ light-locker-settings/light_locker_xfsync.py	2015-06-16 15:16:34 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #   Light Locker Settings - simple configuration tool for light-locker
 #   Copyright (C) 2014 Thomas Molloy <[e-mail]>