Merge lp:~ogra/xdiagnose/py3port into lp:xdiagnose

[Oliver Grawert]

this merge carries all program code changes for python3 support, do not merge it standalone without package changes. this branch is kept separate from py3 package fixes for easier reviewing only, packaging adjustments will follow shortly in another merge proposal.

[Colin Watson (cjwatson)]

- for k, r in codes.items():
+ for k, r in list(codes.items()):

This is just 2to3 being conservative; you don't actually need the list() here, since the body of the loop doesn't modify codes.

+ dates = list(dates.keys())
  dates.sort()
  return dates

Simpler: "return sorted(dates)"

+ pkgs = list(dpkg_events.keys())
  pkgs.sort()
  for pkg in pkgs:

"for pkg in sorted(dpkg_events):"

+ print(device.name, device.regex, end=' ')
...

Doesn't this end up writing double spaces sometimes (e.g. in the "NOT SUPPORTED" case)? I'd have been inclined to use end=''.

The rest looks fine to me, although I'd have been inclined to add print_function and absolute_import imports from __future__ as applicable just in case there's a need to revert the #! to /usr/bin/python for some reason.

review: Approve

[lp:~ogra/xdiagnose/py3port]

255. By Oliver Grawert on 2012-06-11

include required and recommended changes from cjwatson review on merge proposal 109633

256. By Oliver Grawert on 2012-06-12

adjust packaging bits for python3 support

257. By Oliver Grawert on 2012-06-12

use python_distutils in debian/rules and actually install from the real builddir, thanks xnox for helping with the fix

258. By Oliver Grawert on 2012-06-12

fix a remaining porting error with xdiagnose/applet.py (exception handling with multiple args has changed)

[Bryce Harrington (bryce)]

Changes look good. Once you've verified the test suite is still happy let me know and I'll merge this in.

review: Approve

[lp:~ogra/xdiagnose/py3port]

259. By Oliver Grawert on 2012-06-13

add dependency on python3-apport, various fixes for testsuite, port testsuite to py3, make lp-lib optional for now

260. By Oliver Grawert on 2012-06-13

fix apport report handling in apport-gpu-error-intel.py to match the new API that needs binary file handling

261. By Oliver Grawert on 2012-06-13

xdiagnose/applet.py: fix string handling of subprocess.Popen

[Oliver Grawert (ogra)]

with the latest changes this branch should now be mergeable, UI and testsuite work fine in a quantal VM here

[lp:~ogra/xdiagnose/py3port]

262. By Oliver Grawert on 2012-06-14

add changelog reference to bug 1013171

[Bryce Harrington (bryce)]

When I attempt to debuild -sa -S this branch I get an error on python3-apport:

The following packages have unmet dependencies:
 pbuilder-satisfydepends-dummy : Depends: debhelper (>= 7.0.50~) but it is not going to be installed
                                 Depends: dh-translations but it is not going to be installed
                                 Depends: python3 (>= 3.2) but it is not going to be installed
                                 Depends: python3-all but it is not going to be installed
                                 Depends: intltool but it is not going to be installed
                                 Depends: apport but it is not going to be installed
                                 Depends: python3-apport but it is not installable
                                 Depends: python3-distutils-extra (>= 2.32-2) but it is not going to be installed
E: Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a solution).

I think that python3-apport might be ok as a package dependency rather than a build dependency since it's just the apport hooks that require it during their execution. But after moving that, there's this error:

dh_auto_clean
Traceback (most recent call last):
  File "setup.py", line 20, in <module>
    import DistUtilsExtra.auto
ImportError: No module named DistUtilsExtra.auto

Which is a bit of a head-scratcher. Maybe dh_auto_clean is calling setup.py as python2 or something?

review: Needs Fixing

[lp:~ogra/xdiagnose/py3port]

263. By Oliver Grawert on 2012-06-15

eek, what was i thinking, indeed we want to depend (not build-depend) on python-apport (and not python3-apport)

[Oliver Grawert (ogra)]

sorry, indeed the build-dep was wrong and i'm also not sure why i used python3 in the package name (python-apport is actually the py3 version already), fixed now ...

the build error does not happen for me over here, it is indeed strange

[Bryce Harrington (bryce)]

Excellent, thanks!

I sorted out the build issue I was seeing. It appears that the package build requires *both* python-distutils-extra and python3-distutils-extra. Not sure why, but unless both are included as build requirements, the package fails in the dh_auto_clean proc. I'm guessing that this is running clean for both python2 and python3, or something like that.

There's still a couple warnings I'm seeing:

   dh_python3 -O--buildsystem=python_distutils
W: dh_python3:181: Python 2.x location detected, please use dh_python2: debian/xdiagnose/usr/lib/python2.7
   dh_python2 -O--buildsystem=python_distutils
W: dh_python2:334: Python 3.x location detected, please use dh_python3: debian/xdiagnose/usr/lib/python3
   dh_usrlocal -O--buildsystem=python_distutils

However I think those are unrelated, and sound possibly innocuous so am going to ignore them for now. But if these sound meaningful to you, I'd love some tips on resolving them.

review: Approve

[Thomas Kluyver (takluyver)]

Are you sure python-apport is the right thing to depend on? It seems to explicitly depend on Python 2: http://packages.ubuntu.com/quantal/python-apport

=== modified file 'apport/apport-gpu-error-intel.py'
--- apport/apport-gpu-error-intel.py	2012-04-13 20:32:36 +0000
+++ apport/apport-gpu-error-intel.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import os.path
@@ -153,12 +155,12 @@
     report_filename = '/var/crash/%s.%s.crash' % (report['Package'], str(nowtime).replace(' ', '_'))
 
     if '--stdout' in argv:
-        print "# %s" %(report_filename)
-        report.write(sys.stdout)
+        print("# %s" %(report_filename))
+        report.write(sys.stdout.buffer)
         return 0
 
-    report_file = os.fdopen(os.open(report_filename, os.O_WRONLY|os.O_CREAT|os.O_EXCL), 'w')
-    os.chmod(report_filename, 0600)
+    report_file = os.fdopen(os.open(report_filename, os.O_WRONLY|os.O_CREAT|os.O_EXCL), 'wb')
+    os.chmod(report_filename, 0o600)
 
     try:
         report.write(report_file)

=== modified file 'apport/source_xorg.py'
--- apport/source_xorg.py	2012-04-13 20:09:26 +0000
+++ apport/source_xorg.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 '''Xorg Apport interface
 
@@ -14,12 +14,18 @@
 Testing:  APPORT_STAGING="yes"
 '''
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import os.path
 import glob
 import re
 import subprocess
 from apport.hookutils import *
-from launchpadlib.launchpad import Launchpad
+
+try:
+    from launchpadlib.launchpad import Launchpad
+except ImportError:
+    pass
 
 core_x_packages = [
     'xorg', 'xorg-server', 'xserver-xorg-core', 'mesa'
@@ -436,7 +442,7 @@
         'GconfCompiz')
 
     # Compiz internal state if compiz crashed
-    if report.get('SourcePackage','Unknown') == "compiz" and report.has_key("ProcStatus"):
+    if report.get('SourcePackage','Unknown') == "compiz" and "ProcStatus" in report:
         compiz_pid = 0
         pid_line = re.search("Pid:\t(.*)\n", report["ProcStatus"])
         if pid_line:
@@ -692,7 +698,7 @@
 
     report = {}
     if not add_info(report, None):
-        print "Unreportable bug"
+        print("Unreportable bug")
         sys.exit(1)
     for key in report:
-        print '[%s]\n%s' % (key, report[key])
+        print('[%s]\n%s' % (key, report[key]))

=== modified file 'bin/dpkg-log-summary'
--- bin/dpkg-log-summary	2012-04-04 21:06:10 +0000
+++ bin/dpkg-log-summary	2012-06-15 11:25:23 +0000
@@ -1,8 +1,10 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 
 # NOTE: Be careful to run this from the same distro version as the upgrade was done on
 # otherwise, it may not be able to look up the proper packages.
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import re
 import os
 import sys
@@ -23,9 +25,7 @@
             continue
         event_date = datetime.datetime.strptime(m.group(1), "%Y-%m-%d")
         dates[event_date] = True
-    dates = dates.keys()
-    dates.sort()
-    return dates
+    return sorted(dates)
 
 def parse_dpkg(dpkg_text, start_date=None, end_date=None):
     re_dpkg = re.compile(r'^(\d+-\d+-\d+) (\d\d:\d\d:\d\d) (\w+) (.*)$')
@@ -113,13 +113,13 @@
         dpkg_log_filename = args[0]
 
     if options.verbose:
-        print "Reading from %s" %(dpkg_log_filename)
+        print("Reading from %s" %(dpkg_log_filename))
     dpkg_text = loadfile(dpkg_log_filename)
 
     if options.show_dates:
         event_dates = parse_dpkg_dates(dpkg_text)
         for d in event_dates:
-            print d.strftime("%Y-%m-%d")
+            print(d.strftime("%Y-%m-%d"))
         sys.exit(0)
 
     start_date = None
@@ -130,13 +130,11 @@
         end_date = datetime.datetime.strptime(options.end_date, "%Y-%m-%d")
     dpkg_events = parse_dpkg(dpkg_text, start_date, end_date)
 
-    pkgs = dpkg_events.keys()
-    pkgs.sort()
-    for pkg in pkgs:
+    for pkg in sorted(dpkg_events):
         indent = ''
         for event in dpkg_events[pkg]:
-            print "%s%-8s %-30s %-12s %-12s %-30s %-30s" %(indent,
-                event['action'], event['source_package'], event['date'], event['time'], event['old_version'], event['new_version'])
+            print("%s%-8s %-30s %-12s %-12s %-30s %-30s" %(indent,
+                event['action'], event['source_package'], event['date'], event['time'], event['old_version'], event['new_version']))
             indent += ' '
 
     sys.exit(0)

=== modified file 'bin/xdiagnose'
--- bin/xdiagnose	2012-05-17 05:13:11 +0000
+++ bin/xdiagnose	2012-06-15 11:25:23 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Copyright (C) 2010 Bryce Harrington [e-mail]
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 import os
 import logging

=== modified file 'bin/xpci'
--- bin/xpci	2012-05-17 05:13:11 +0000
+++ bin/xpci	2012-06-15 11:25:23 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Copyright (C) 2012 Bryce Harrington [e-mail]
@@ -14,6 +14,8 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 import sys
 import os
 
@@ -48,13 +50,13 @@
         sys.exit(1)
     for device in devices:
         if device:
-            print device.name, device.regex,
+            print(device.name, device.regex, end='')
             if device.generation:
-                print device.generation,
+                print(device.generation, end='')
             if device.title:
-                print device.title,
-            print ','.join(device.drivers),
+                print(device.title, end='')
+            print(','.join(device.drivers), end='')
             if not device.supported:
-                print " (NOT SUPPORTED)"
+                print(" (NOT SUPPORTED)")
 
 

=== modified file 'bin/xrandr-tool'
--- bin/xrandr-tool	2012-04-04 21:06:10 +0000
+++ bin/xrandr-tool	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 import re
@@ -7,12 +9,12 @@
 if __name__ == "__main__":
     # TODO: optparse
     if len(sys.argv) < 2:
-        print "Usage:  xrandr-tool <command>"
-        print
-        print "Commands:"
-        print "  outputs"
-        print "  current-resolution [output-name]"
-        print "  resolutions [output-name]"
+        print("Usage:  xrandr-tool <command>")
+        print()
+        print("Commands:")
+        print("  outputs")
+        print("  current-resolution [output-name]")
+        print("  resolutions [output-name]")
         sys.exit(1)
 
     command = sys.argv[1]
@@ -35,7 +37,7 @@
         if m:
             current_output_name = m.group(1)
             if command == "outputs":
-                print current_output_name
+                print(current_output_name)
 
         if "resolution" in command:
             m = re_res.match(line)
@@ -43,6 +45,6 @@
                 res = m.group(1)
                 if command == "current-resolution":
                     if line.find('*') != -1:
-                        print res
+                        print(res)
                 else:
-                    print res
+                    print(res)

=== modified file 'data/workloads/run_workloads'
--- data/workloads/run_workloads	2012-04-04 21:06:10 +0000
+++ data/workloads/run_workloads	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 import apt

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-19 23:46:45 +0000
+++ debian/changelog	2012-06-15 11:25:23 +0000
@@ -1,3 +1,19 @@
+xdiagnose (2.7) UNRELEASED; urgency=low
+
+  * port all program code to new python3 conventions
+  * adjust shebang lines for all python scripts to use python3
+  * update debian/rules and control for python3 support
+  * remove unused debian/pycompat file
+  * switch test suite to python3
+  * make test suite skip testing of directories
+  * add dependency on python3-apport
+  * make launchpadlib usage optional until it is ported to python3
+  * adjust apport-gpu-error-intel.py for new apport API
+  * xdiagnose/applet.py fix string handling of subprocess.Popen
+  * fixes (LP: #1013171)
+
+ -- Oliver Grawert <[e-mail]>  Mon, 11 Jun 2012 15:21:17 +0200
+
 xdiagnose (2.6) quantal; urgency=low
 
   * Add general.lib to consolidate common bash functions

=== modified file 'debian/control'
--- debian/control	2012-05-19 23:46:45 +0000
+++ debian/control	2012-06-15 11:25:23 +0000
@@ -1,14 +1,15 @@
 Source: xdiagnose
 Section: python
 Priority: extra
+X-Python3-Version: >= 3.2
 Build-Depends:
  debhelper (>= 7.0.50~),
  dh-translations,
- python (>= 2.6.6-3~),
- python-all,
+ python3 (>= 3.2),
+ python3-all,
  intltool,
  apport,
- python-distutils-extra (>= 2.28)
+ python3-distutils-extra (>= 2.32-2)
 Maintainer: Bryce Harrington <[e-mail]>
 Standards-Version: 3.9.2
 Homepage: http://wiki.ubuntu.com/X
@@ -17,9 +18,10 @@
 Architecture: all
 Depends:
  ${misc:Depends},
- ${python:Depends},
- python-gi (>= 2.28),
+ ${python3:Depends},
+ python3-gi (>= 3.2.0-3),
  gir1.2-gtk-3.0,
+ python-apport,
  intel-gpu-tools
 Replaces:
  xserver-xorg-video-intel (<= 2:2.14.0-4ubuntu8),

=== removed file 'debian/pycompat'
--- debian/pycompat	2010-07-03 00:42:11 +0000
+++ debian/pycompat	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-2

=== modified file 'debian/rules'
--- debian/rules	2012-05-19 23:46:45 +0000
+++ debian/rules	2012-06-15 11:25:23 +0000
@@ -1,7 +1,23 @@
 #!/usr/bin/make -f
 
 %:
-	dh "$@" --with python2,translations --buildsystem python_distutils
+	dh "$@" --with python2,python3,translations --buildsystem python_distutils
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf build
+
+override_dh_auto_build:
+	dh_auto_build
+	set -ex; for python in $(shell py3versions -r); do \
+	        $$python setup.py build; \
+	done
+
+override_dh_auto_install:
+	dh_auto_install
+	set -ex; for python in $(shell py3versions -r); do \
+	        $$python setup.py install --root=$(CURDIR)/debian/xdiagnose --install-layout=deb; \
+	done
 
 override_dh_installinit:
 	dh_installinit --no-start --upstart-only --name failsafe-x

=== modified file 'run-tests'
--- run-tests	2011-12-12 04:02:35 +0000
+++ run-tests	2012-06-15 11:25:23 +0000
@@ -4,7 +4,7 @@
     echo $t
     file_type=$(file -b $t)
     case ${file_type} in
-        *python*) python ${t} ;;
+        *?ython*) python3 ${t} ;;
         *Bourne*) bash ${t} ;;
         *bash*)   bash ${t} ;;
         *perl*)   perl ${t} ;;

=== modified file 'setup.py'
--- setup.py	2012-04-15 17:44:44 +0000
+++ setup.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
 #
 # Copyright (C) 2010-2011 Bryce Harrington [e-mail]

=== modified file 'tests/test_apport_gpu_hook'
--- tests/test_apport_gpu_hook	2012-04-18 01:07:19 +0000
+++ tests/test_apport_gpu_hook	2012-06-15 11:25:23 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 echo "# Testing intel GPU hook..."
-lines=$(python apport/apport-gpu-error-intel.py --stdout --force| wc -l)
+lines=$(python3 apport/apport-gpu-error-intel.py --stdout --force| wc -l)
 retval=$?
 if [ $retval -ne 0 ]; then
     echo "ERROR"

=== modified file 'tests/test_diagnostic'
--- tests/test_diagnostic	2012-04-18 01:07:19 +0000
+++ tests/test_diagnostic	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys, os.path
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "..")))

=== modified file 'tests/test_grub_file'
--- tests/test_grub_file	2012-04-18 01:07:19 +0000
+++ tests/test_grub_file	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys, os.path
 sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), "..")))

=== modified file 'tests/test_script_syntax.sh'
--- tests/test_script_syntax.sh	2012-03-17 05:59:07 +0000
+++ tests/test_script_syntax.sh	2012-06-15 11:25:23 +0000
@@ -45,13 +45,15 @@
             perl -c $script >/dev/null 2>&1
             display_result $? 'perl' ${script}
             ;;
-        *python*script*)
-            python -m py_compile ${script}
-            display_result $? 'python' ${script}
+        *?ython*script*)
+            python3 -m py_compile ${script}
+            display_result $? 'python3' ${script}
 	    if [ -e ${script}c ]; then
 		rm ${script}c
 	    fi
             ;;
+        *directory*)
+            ;;
         *) echo "Unknown script type '${file_type}'"
             display_result 1 ${script}
     esac

=== modified file 'tests/test_source_xorg'
--- tests/test_source_xorg	2012-04-18 01:07:19 +0000
+++ tests/test_source_xorg	2012-06-15 11:25:23 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/bash
 
 echo "# Testing apport hook..."
-lines=$(python apport/source_xorg.py | wc -l)
+lines=$(python3 apport/source_xorg.py | wc -l)
 if [ $? -ne 0 ]; then
     echo "FAIL"
     exit 1

=== modified file 'xdiagnose/applet.py'
--- xdiagnose/applet.py	2012-03-22 00:56:31 +0000
+++ xdiagnose/applet.py	2012-06-15 11:25:23 +0000
@@ -31,7 +31,7 @@
         self.is_running = True
 
         if not os.path.exists(self.__grub_config_filename):
-            print "Error: No %s present" %(self.__grub_config_filename)
+            print("Error: No %s present" %(self.__grub_config_filename))
             sys.exit(1)
 
         Gtk.Window.__init__(self)
@@ -258,7 +258,7 @@
         active = widget.get_active()
         if active == self.__enable_apport:
             return
-        print "Handling apport enabled"
+        print("Handling apport enabled")
 
         if self.has_enable_apport(widget.get_active()):
             enabled = 1
@@ -305,9 +305,9 @@
         errors = []
 
         # Xorg.0.log errors
-        process = subprocess.Popen(['grep', '(EE)', '/var/log/Xorg.0.log'], stdout=subprocess.PIPE)
+        process = subprocess.Popen(['grep', '(EE)', '/var/log/Xorg.0.log'], universal_newlines=True)
         stdout, stderr = process.communicate()
-        for err in stdout.split("\n"):
+        for err in str(stdout).split("\n"):
             m = re_jockey_error.match(err)
             if not m:
                 continue
@@ -316,9 +316,9 @@
             errors.append(errmsg)
 
         # dmesg errors
-        process = subprocess.Popen(['dmesg'], stdout=subprocess.PIPE)
+        process = subprocess.Popen(['dmesg'], universal_newlines=True)
         stdout, stderr = process.communicate()
-        for err in stdout.split("\n"):
+        for err in str(stdout).split("\n"):
             m = re_dmesg_error.match(err)
             if not m:
                 continue
@@ -328,9 +328,9 @@
 
         # jockey errors
         if os.path.exists('/var/log/jockey.log'):
-            process = subprocess.Popen(['grep', 'ERROR', '/var/log/jockey.log'], stdout=subprocess.PIPE)
+            process = subprocess.Popen(['grep', 'ERROR', '/var/log/jockey.log'], universal_newlines=True)
             stdout, stderr = process.communicate()
-            for err in stdout.split("\n"):
+            for err in str(stdout).split("\n"):
                 m = re_dmesg_error.match(err)
                 if not m:
                     continue
@@ -397,14 +397,14 @@
             bak_path = safe_backup(self.__grub_config_filename)
             if not bak_path:
                 # TODO: Display error message dialog
-                print "Error:  Could not backup file %s.  Changes not applied." %(
-                    self.__grub_config_filename)
+                print("Error:  Could not backup file %s.  Changes not applied." %(
+                    self.__grub_config_filename))
                 return
-        except IOError, err:
+        except IOError as err:
             # TODO: Display error message dialog
-            print "Error:  Failure creating backup file for %s.  Changes not applied." %(
-                self.__grub_config_filename)
-            print err
+            print("Error:  Failure creating backup file for %s.  Changes not applied." %(
+                self.__grub_config_filename))
+            print(err)
             return
 
         # Move new file into place

=== modified file 'xdiagnose/application.py'
--- xdiagnose/application.py	2012-01-11 16:21:29 +0000
+++ xdiagnose/application.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import gtk
 

=== modified file 'xdiagnose/config_update.py'
--- xdiagnose/config_update.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/config_update.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 import sys
@@ -88,21 +90,21 @@
     '''filename is the input file.  fileio is the output stream'''
     keys = []
     if override_params:
-        keys = override_params.keys()
+        keys = list(override_params.keys())
     if merge_params:
-        keys.extend(merge_params.keys())
+        keys.extend(list(merge_params.keys()))
     keys = list(set(keys))
     keys.sort()
 
-    print filename
+    print(filename)
     for line in fileinput.input(filename):
-        print line
+        print(line)
         new_line = line
 
         if merge_params is not None:
-            print "Merging parameters"
+            print("Merging parameters")
             for key in merge_params:
-                print " - %s" %(key)
+                print(" - %s" %(key))
                 p = re.compile("^\s*"+key+"\s*"+delim+"\s*(\"?)(.*)(\"?)")
                 m = p.match(line)
                 if m:
@@ -112,8 +114,8 @@
                     keys.remove(key)
 
         if override_params is not None:
-            print "Overriding parameters"
-            for key in override_params.keys():
+            print("Overriding parameters")
+            for key in list(override_params.keys()):
                 p = re.compile("^\s*"+key+"\s*"+delim)
                 if p.match(line):
                     new_line = "%s%s%s\n" %(key, delim, override_params[key])
@@ -124,7 +126,7 @@
 
     # Handle case of parameters that weren't already present in the file
     for key in keys:
-        print "Adding key %s" %(key)
+        print("Adding key %s" %(key))
         if override_params and key in override_params:
             fileio.write("%s%s%s\n" %(key, delim, override_params[key]))
         elif merge_params and key in merge_params:

=== modified file 'xdiagnose/diagnostics.py'
--- xdiagnose/diagnostics.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/diagnostics.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 #
 # Copyright (C) 2010 Bryce Harrington <[e-mail]>
@@ -22,6 +22,7 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+from __future__ import absolute_import, print_function, unicode_literals
 
 class Diagnostic:
     def __init__(self):
@@ -36,7 +37,7 @@
     def backup_xorg_conf(self):
         # xorg_conf_backup="/etc/X11/xorg.conf-backup-${timestamp}"
         # cp /etc/X11/xorg.conf ${xorg_conf_backup}
-        print "Your config could not be backed up."
+        print("Your config could not be backed up.")
         return False
 
     def default_config(self):
@@ -46,8 +47,8 @@
         # rm /etc/X11/xorg.conf
         #print "Failure restoring configuration to default."
         #print "Your config has not been changed."
-        print "Your configuration has been restored to default and"
-        print "your old configuration backed up.  Please restart."
+        print("Your configuration has been restored to default and")
+        print("your old configuration backed up.  Please restart.")
         return True
 
     def run_xorgconf(self):
@@ -55,7 +56,7 @@
             return False
 
         # Xorg :99 -configure
-        print "Could not generate a new configuration"
+        print("Could not generate a new configuration")
         return False
 
     def view_xorg_log(self):
@@ -68,7 +69,7 @@
 
     def verify_xorgconf(self):
         # Run Alberto's xorg.conf checker (once it's available in main)
-        print "Sorry, this option is not implemented yet"
+        print("Sorry, this option is not implemented yet")
         return False
 
     def edit_config(self):
@@ -117,36 +118,36 @@
 
     def menu(self, level):
         if level == "0":
-            print "Choice:"
-            print "1. Run in low-graphics mode for just one session"
-            print "2. Reconfigure graphics"
-            print "3. Troubleshoot the error"
-            print "4. Exit to console login"
+            print("Choice:")
+            print("1. Run in low-graphics mode for just one session")
+            print("2. Reconfigure graphics")
+            print("3. Troubleshoot the error")
+            print("4. Exit to console login")
 
         elif level == "1":
             pass
 
         elif level == "2":
-            print "Reconfiguration:"
-            print "How would you like to reconfigure your display?"
-            print "2a. Use default (generic) configuration"
-            print "2b. Create new configuration for this hardware"
-            print "2c. Use your backed-up configuration"
+            print("Reconfiguration:")
+            print("How would you like to reconfigure your display?")
+            print("2a. Use default (generic) configuration")
+            print("2b. Create new configuration for this hardware")
+            print("2c. Use your backed-up configuration")
 
         elif level == "3":
-            print "Troubleshooting:"
-            print "What information would you like to review?"
-            print "3a. Review the xserver log file"
-            print "3b. Review the startup errors"
-            print "3c. Edit configuration file"
-            print "3d. Archive configuration and logs"
+            print("Troubleshooting:")
+            print("What information would you like to review?")
+            print("3a. Review the xserver log file")
+            print("3b. Review the startup errors")
+            print("3c. Edit configuration file")
+            print("3d. Archive configuration and logs")
 
         else:
-            print "xdiagnose walks you through troubleshooting a few common X errors."
-            print
-            print " * Screen blanks when lid is closed, and never comes back"
-            print " * 3D performance is horrible"
-            print " * Maximum resolution is lower than what screen can actually perform"
+            print("xdiagnose walks you through troubleshooting a few common X errors.")
+            print()
+            print(" * Screen blanks when lid is closed, and never comes back")
+            print(" * 3D performance is horrible")
+            print(" * Maximum resolution is lower than what screen can actually perform")
 
     def lid_close_blank(self):
         # Examine kernel logs to see if there was any evidence of it

=== modified file 'xdiagnose/edid.py'
--- xdiagnose/edid.py	2012-05-22 19:24:10 +0000
+++ xdiagnose/edid.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys, os, re
 
@@ -25,51 +27,51 @@
         line = m.group(1)
     edid += line
 
-print "%20s %s" %("Header:", edid_bytes(edid,0,7))
-print "%20s %s" %("Manufacturer:", edid_bytes(edid,8,9))
-print "%20s %s" %("Product ID code:", edid_bytes(edid,10,11))
-print "%20s %s" %("Serial Number:", edid_bytes(edid,12,15))
-print "%20s %s" %("Week of Manufacture:", edid_bytes(edid,16))
-print "%20s %s" %("Year of Manufactur:", edid_bytes(edid,17))
-print "%20s %s" %("EDID Version:", edid_bytes(edid,18))
-print "%20s %s" %("EDID Revision:", edid_bytes(edid,19))
-
-print "%20s %s" %("Video input def:", edid_bytes(edid,20))
-print "%20s %s" %("Max Horiz Image(cm):", edid_bytes(edid,21))
-print "%20s %s" %("Max Vert Image(cm):", edid_bytes(edid,22))
-print "%20s %s" %("Gamma:", edid_bytes(edid,23))
-print "%20s %s" %("Power management:", edid_bytes(edid,24))
-
-print "%20s %s" %("Chromaticity:", edid_bytes(edid,25,34))
-print "%20s %s" %("Timing I:", edid_bytes(edid,35))
-print "%20s %s" %("Timing II:", edid_bytes(edid,36))
-print "%20s %s" %("Reserved Timing:", edid_bytes(edid,37))
-print "%20s %s" %("Standard Timing:", edid_bytes(edid,38,53))
-print "Descriptor Block 1"
-print "%20s %s" %("Horiz Active (px):", edid_bytes(edid,56))
-print "%20s %s" %("Horiz Blanking:", edid_bytes(edid,57))
-print "%20s %s" %("Horiz high:", edid_bytes(edid,58))
-print "%20s %s" %("Vert Active:", edid_bytes(edid,59))
-print "%20s %s" %("Vert Blank:", edid_bytes(edid,60))
-print "%20s %s" %("Vert high:", edid_bytes(edid,61))
-print "%20s %s" %("Horz Sync Offset (px):", edid_bytes(edid,62))
-print "%20s %s" %("Horiz Sync Pulse Width (px):", edid_bytes(edid,63))
-print "%20s %s" %("Vert Sync (lines):", edid_bytes(edid,64))
-print "%20s %s" %("high:", edid_bytes(edid,65))
-print "%20s %s" %("Horiz Image Size (mm):", edid_bytes(edid,66))
-print "%20s %s" %("Vert Image Size (mm):", edid_bytes(edid,67))
-print "%20s %s" %("Image Size high:", edid_bytes(edid,68))
-print "%20s %s" %("Horiz Border:", edid_bytes(edid,69))
-print "%20s %s" %("Vert Border:", edid_bytes(edid,70))
-print "%20s %s" %("Interlacing:", edid_bytes(edid,71))
-print "Descriptor Block 2"
-print "%20s %s" %("Descriptor Block 2:", edid_bytes(edid,72,89))
-print "Descriptor Block 3"
-print "%20s %s" %("Descriptor Block 3:", edid_bytes(edid,90,107))
-print "Descriptor Block 4"
-print "%20s %s" %("Descriptor Block 4:", edid_bytes(edid,108,125))
-print "%20s %s" %("Extension Flag:", edid_bytes(edid,126))
-print "%20s %s" %("Checksum:", edid_bytes(edid,127))
+print("%20s %s" %("Header:", edid_bytes(edid,0,7)))
+print("%20s %s" %("Manufacturer:", edid_bytes(edid,8,9)))
+print("%20s %s" %("Product ID code:", edid_bytes(edid,10,11)))
+print("%20s %s" %("Serial Number:", edid_bytes(edid,12,15)))
+print("%20s %s" %("Week of Manufacture:", edid_bytes(edid,16)))
+print("%20s %s" %("Year of Manufactur:", edid_bytes(edid,17)))
+print("%20s %s" %("EDID Version:", edid_bytes(edid,18)))
+print("%20s %s" %("EDID Revision:", edid_bytes(edid,19)))
+
+print("%20s %s" %("Video input def:", edid_bytes(edid,20)))
+print("%20s %s" %("Max Horiz Image(cm):", edid_bytes(edid,21)))
+print("%20s %s" %("Max Vert Image(cm):", edid_bytes(edid,22)))
+print("%20s %s" %("Gamma:", edid_bytes(edid,23)))
+print("%20s %s" %("Power management:", edid_bytes(edid,24)))
+
+print("%20s %s" %("Chromaticity:", edid_bytes(edid,25,34)))
+print("%20s %s" %("Timing I:", edid_bytes(edid,35)))
+print("%20s %s" %("Timing II:", edid_bytes(edid,36)))
+print("%20s %s" %("Reserved Timing:", edid_bytes(edid,37)))
+print("%20s %s" %("Standard Timing:", edid_bytes(edid,38,53)))
+print("Descriptor Block 1")
+print("%20s %s" %("Horiz Active (px):", edid_bytes(edid,56)))
+print("%20s %s" %("Horiz Blanking:", edid_bytes(edid,57)))
+print("%20s %s" %("Horiz high:", edid_bytes(edid,58)))
+print("%20s %s" %("Vert Active:", edid_bytes(edid,59)))
+print("%20s %s" %("Vert Blank:", edid_bytes(edid,60)))
+print("%20s %s" %("Vert high:", edid_bytes(edid,61)))
+print("%20s %s" %("Horz Sync Offset (px):", edid_bytes(edid,62)))
+print("%20s %s" %("Horiz Sync Pulse Width (px):", edid_bytes(edid,63)))
+print("%20s %s" %("Vert Sync (lines):", edid_bytes(edid,64)))
+print("%20s %s" %("high:", edid_bytes(edid,65)))
+print("%20s %s" %("Horiz Image Size (mm):", edid_bytes(edid,66)))
+print("%20s %s" %("Vert Image Size (mm):", edid_bytes(edid,67)))
+print("%20s %s" %("Image Size high:", edid_bytes(edid,68)))
+print("%20s %s" %("Horiz Border:", edid_bytes(edid,69)))
+print("%20s %s" %("Vert Border:", edid_bytes(edid,70)))
+print("%20s %s" %("Interlacing:", edid_bytes(edid,71)))
+print("Descriptor Block 2")
+print("%20s %s" %("Descriptor Block 2:", edid_bytes(edid,72,89)))
+print("Descriptor Block 3")
+print("%20s %s" %("Descriptor Block 3:", edid_bytes(edid,90,107)))
+print("Descriptor Block 4")
+print("%20s %s" %("Descriptor Block 4:", edid_bytes(edid,108,125)))
+print("%20s %s" %("Extension Flag:", edid_bytes(edid,126)))
+print("%20s %s" %("Checksum:", edid_bytes(edid,127)))
 
 
 

=== modified file 'xdiagnose/errors_treeview.py'
--- xdiagnose/errors_treeview.py	2012-03-16 06:25:58 +0000
+++ xdiagnose/errors_treeview.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 # example basictreeview.py
 

=== modified file 'xdiagnose/info.py'
--- xdiagnose/info.py	2012-03-16 06:34:29 +0000
+++ xdiagnose/info.py	2012-06-15 11:25:23 +0000
@@ -1,6 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 '''High level package information'''
 PROGNAME = 'xdiagnose'
 URL = 'http://launchpad.net/xdiagnose'
@@ -65,12 +67,12 @@
 
 
 if __name__ == "__main__":
-    print PROGNAME, VERSION, URL
-    print "Copyright (C) %s %s <%s>" % (
-        DATE_COPYRIGHT, LEAD_DEVELOPER.name, LEAD_DEVELOPER.email)
-    print
+    print(PROGNAME, VERSION, URL)
+    print("Copyright (C) %s %s <%s>" % (
+        DATE_COPYRIGHT, LEAD_DEVELOPER.name, LEAD_DEVELOPER.email))
+    print()
     for contributor in CONTRIBUTORS:
-        print "%s %s %s" % (
+        print("%s %s %s" % (
             contributor.name,
             contributor.display_email,
-            contributor.display_roles)
+            contributor.display_roles))

=== modified file 'xdiagnose/pci_devices.py'
--- xdiagnose/pci_devices.py	2012-04-05 01:06:49 +0000
+++ xdiagnose/pci_devices.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import re
 
@@ -1057,8 +1059,8 @@
         """
 
     for device in get_pci_devices(pci_text):
-        print device.name, device.supported, ','.join(device.drivers)
+        print(device.name, device.supported, ','.join(device.drivers))
 
     pci_text = Popen('lspci -vvnn', stdout=PIPE, shell=True).stdout.read()
     for device in get_pci_devices(pci_text):
-        print device.name, device.supported, ','.join(device.drivers)
+        print(device.name, device.supported, ','.join(device.drivers))

=== modified file 'xdiagnose/utils/dates.py'
--- xdiagnose/utils/dates.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/dates.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from datetime import (
     datetime,
@@ -41,10 +43,10 @@
     return tsec
 
 if __name__ == '__main__':
-    print week_start()
+    print(week_start())
 
     td = timedelta(days=10, seconds=2.999)
     dt = datetime.today() - td
-    print week_start(dt)
+    print(week_start(dt))
 
-    print "%d == %d\n" %(total_seconds(td), td.total_seconds())
+    print("%d == %d\n" %(total_seconds(td), td.total_seconds()))

=== modified file 'xdiagnose/utils/debug.py'
--- xdiagnose/utils/debug.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/debug.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import sys
 

=== modified file 'xdiagnose/utils/execute.py'
--- xdiagnose/utils/execute.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/execute.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from subprocess import Popen, PIPE
 def execute(cmd):

=== modified file 'xdiagnose/utils/math.py'
--- xdiagnose/utils/math.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/math.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 def clamp(x, low, high):
     """

=== modified file 'xdiagnose/utils/option_handler.py'
--- xdiagnose/utils/option_handler.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/option_handler.py	2012-06-15 11:25:23 +0000
@@ -1,6 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
+from __future__ import absolute_import, print_function, unicode_literals
+
 '''Command line options'''
 
 from optparse import OptionParser

=== modified file 'xdiagnose/utils/paths.py'
--- xdiagnose/utils/paths.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/paths.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from os.path import (
     relpath,
@@ -20,4 +22,4 @@
 
 
 if __name__ == "__main__":
-    print find_datadir('xdiagnose')
+    print(find_datadir('xdiagnose'))

=== modified file 'xdiagnose/utils/screen.py'
--- xdiagnose/utils/screen.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/screen.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 from gi.repository.Gdk import Screen
 
@@ -13,6 +15,6 @@
 
 if __name__ == "__main__":
     if X_is_running():
-        print "X is running"
+        print("X is running")
     else:
-        print "X is not running"
+        print("X is not running")

=== modified file 'xdiagnose/utils/text.py'
--- xdiagnose/utils/text.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/utils/text.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 def quote(msg):
     """

=== modified file 'xdiagnose/welcome.py'
--- xdiagnose/welcome.py	2012-03-17 02:45:04 +0000
+++ xdiagnose/welcome.py	2012-06-15 11:25:23 +0000
@@ -1,4 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/python3
+
+from __future__ import absolute_import, print_function, unicode_literals
 
 import os
 import gtk
@@ -8,9 +10,9 @@
 from gettext import gettext as _
 gettext.textdomain('xdiagnose')
 
-from application import Application
-from utils.debug import dbg
-from utils.execute import execute
+from .application import Application
+from .utils.debug import dbg
+from .utils.execute import execute
 
 
 class XDiagnoseApplication(Application):