Merge lp:~cr3/checkbox/key_test_python3 into lp:checkbox

[Marc Tardif]

[Brendan Donegan (brendan-donegan)]

So we're going for 'only works in python3'. That's fine by me, I don't see any reason why we'd want to backport this to any version older than Oneiric anyway.

review: Approve

[Marc Tardif (cr3)]

For your reassurance, "only works in python3" is the way to move forward that was recommended during python3 related sessions at UDS.

=== modified file 'debian/control'
--- debian/control	2012-03-07 00:10:02 +0000
+++ debian/control	2012-05-28 13:36:18 +0000
@@ -11,7 +11,7 @@
 Section: python
 Architecture: any
 Depends: ${misc:Depends}, ${python:Depends}, debconf, python-libxml2, udev
-Recommends: dpkg (>= 1.13), gstreamer0.10-gconf, lsb-release, perl, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10, python-gtk2
+Recommends: dpkg (>= 1.13), gstreamer0.10-gconf, lsb-release, perl, pm-utils, python-apport, python-apt, python-dateutil, python-gst0.10, python-gtk2, python3-gi
 Suggests: checkbox-cli | checkbox-gtk, bonnie++, bootchart, bzr, cvs, ethtool, flex, fwts, git-core, hdparm, lshw, make, nmap, obexd-client, python-pexpect, smartmontools, sox, stress, wodim, mesa-utils, wmctrl
 Description: System testing application 
  This project provides an extensible interface for system testing. The
 
=== modified file 'scripts/key_test'
--- scripts/key_test	2012-05-25 20:21:21 +0000
+++ scripts/key_test	2012-05-28 13:36:18 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This file is part of Checkbox.
 #
@@ -105,7 +105,6 @@
         """Parse the characters into a scancode."""
         index = 0
         length = len(characters)
-        characters = map(ord, characters)
         while index < length:
             if (index + 1 < length
                 and characters[index] == 0xE0):
@@ -122,7 +121,6 @@
         """Parse the characters into a keycode."""
         index = 0
         length = len(characters)
-        characters = map(ord, characters)
         while index < length:
             if (index + 2 < length
                 and (characters[index] & 0x7f) == 0