Merge lp:~jpakkane/evemu/python3-preparation into lp:evemu

[Jussi Pakkanen]

Python 3 is coming. This branch prepares for that by cleaning up the code and adding __future__ imports that add stricter checking.

There are very few changes, but personally I would not merge this until after 12/04 has been released.

[Stephen M. Webb (bregma)]

I don't understand why you bother importing stuff from __future__ that never gets used. For example, there are no print statement in any of this code, so why import print_function? Is it not bad form in Python to import moduoles that do not get used?

[Jussi Pakkanen (jpakkane)]

__future__ imports are special. They are not modules, but rather change the behaviour of the compiler/interpreter.

It's a bit like having -Werror on in C. It tells you immediately if you screw up in the future.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~jpakkane/evemu/python3-preparation/+merge/100103/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/evemu-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/evemu-raring-amd64-ci/2//console
    FAILURE: http://jenkins.qa.ubuntu.com/job/evemu-raring-armhf-ci/2//console
    FAILURE: http://jenkins.qa.ubuntu.com/job/evemu-raring-i386-ci/2//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/evemu-ci/2//rebuild/?

review: Needs Fixing (continuous-integration)

Unmerged revisions

55. By Jussi Pakkanen on 2012-03-30

Use unicode literals to prepare for Python 3.

54. By Jussi Pakkanen on 2012-03-30

Added absolute_import for Python 3 preparation.

53. By Jussi Pakkanen on 2012-03-30

Added print_function to prepare for Python 3.

=== modified file 'python/evemu/__init__.py'
--- python/evemu/__init__.py	2012-03-23 15:38:02 +0000
+++ python/evemu/__init__.py	2012-03-30 11:25:35 +0000
@@ -17,8 +17,11 @@
 # You should have received a copy of the GNU Leseer General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 from ctypes.util import find_library
 
+
 import ctypes
 import evemu.base
 import evemu.const
@@ -46,7 +49,7 @@
         to create a pseudo-device node.
         """
 
-        if type(f).__name__ == 'str':
+        if type(f).__name__ == 'str' or type(f).__name__ == 'unicode':
             self._file = open(f, 'r+b')
         elif type(f).__name__ == 'file':
             self._file = f
 
=== modified file 'python/evemu/base.py'
--- python/evemu/base.py	2011-11-24 16:26:02 +0000
+++ python/evemu/base.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 import ctypes
 from ctypes.util import find_library
 import os
 
=== modified file 'python/evemu/const.py'
--- python/evemu/const.py	2011-11-24 03:24:15 +0000
+++ python/evemu/const.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 LIB = "utouch-evemu"
 DEFAULT_LIB = "/usr/lib/libutouch-evemu.so"
 LOCAL_LIB = "../src/.libs/libutouch-evemu.so"
 
=== modified file 'python/evemu/exception.py'
--- python/evemu/exception.py	2011-03-23 19:53:36 +0000
+++ python/evemu/exception.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 class EvEmuError(Exception):
     pass
 
 
=== modified file 'python/evemu/testing/result.py'
--- python/evemu/testing/result.py	2011-11-30 20:11:37 +0000
+++ python/evemu/testing/result.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 import unittest
 try:
     # Python 2.7
@@ -42,7 +44,7 @@
             self.stream.writeln(heading)
         if self.last_class != self.current_class:
             self.stream.writeln("    %s" % this_class)
-        self.stream.write("        %s " % method.ljust(50, "."))
+        self.stream.write("        %s " % method.ljust(50, b"."))
         self.stream.write(" ")
         self.stream.flush()
 
 
=== modified file 'python/evemu/testing/runner.py'
--- python/evemu/testing/runner.py	2011-11-30 20:11:37 +0000
+++ python/evemu/testing/runner.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 import os
 import unittest
 
 
=== modified file 'python/evemu/testing/testcase.py'
--- python/evemu/testing/testcase.py	2011-11-30 20:11:37 +0000
+++ python/evemu/testing/testcase.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 from ctypes.util import find_library
 import os
 import unittest
 
=== modified file 'python/evemu/tests/test_base.py'
--- python/evemu/tests/test_base.py	2011-11-30 20:11:37 +0000
+++ python/evemu/tests/test_base.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,5 @@
+from __future__ import print_function, absolute_import, unicode_literals
+
 import unittest
 
 from evemu import const
 
=== modified file 'python/evemu/tests/test_device.py'
--- python/evemu/tests/test_device.py	2012-03-28 14:33:57 +0000
+++ python/evemu/tests/test_device.py	2012-03-30 11:25:35 +0000
@@ -1,3 +1,4 @@
+from __future__ import print_function, absolute_import, unicode_literals
 
 from evemu.testing import testcase
 from multiprocessing import Process, Queue, Event