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

[Jussi Pakkanen]

Add __future__ imports for stricter compliancy in preparation for Python 3.

I would probably hold off on merging this until after 12/04.

Unicode literals are not yet implemented, because they will be a lot more work. I will either push them here (if this branch is not merged immediately) or create a new branch.

[lp:~jpakkane/geis/python3-preparation]

239. By Jussi Pakkanen on 2012-04-02

Switched to Unicode literals to prepare for Python 3.

[Jussi Pakkanen (jpakkane)]

Added unicode literals. Surprisingly it did not require any actual code changes. Geisview works fine. I recommend thorough testing before merging this, though. There may be corner cases I did not catch.

[Daniel d'Andrada (dandrader)]

It's been a while. Do we still want it in? Seems harmless enough...

review: Needs Information

[Chase Douglas (chasedouglas)]

I remember Stephen had reviewed a python3 branch at one point, and he had some concerns. I would ask him to comment. I don't know enough about python to properly review this.

Alternatively, we could seek the advice of someone who knows python well.

review: Abstain

[Stephen M. Webb (bregma)]

This should definitely go in.

review: Approve

=== modified file 'python/geis/__init__.py'
--- python/geis/__init__.py	2012-03-30 13:43:10 +0000
+++ python/geis/__init__.py	2012-04-02 07:59:19 +0000
@@ -14,9 +14,12 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 """Python bindings for the GEIS gesture recognition interface.
 """
 
+
 __all__ = (
         'Geis', 'Event', 'Filter', 'Subscription',
         'NoMoreEvents',

=== modified file 'python/geis/geis_v2.py'
--- python/geis/geis_v2.py	2011-10-18 20:43:58 +0000
+++ python/geis/geis_v2.py	2012-04-02 07:59:19 +0000
@@ -14,6 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 """Python bindings for the GEIS v2 gesture recognition interface.
 
 Do not use this module directly -- the public API is provided by the 'geis'
@@ -126,7 +128,7 @@
     _geis_frame_touchid = _geis_lib.geis_frame_touchid
 
 except AttributeError as ex:
-    print ex
+    print(ex)
     sys.exit(1)
 
 
@@ -369,7 +371,7 @@
 
 
 def _pointer_type_unknown(attr):
-    print "unknown pointer type", _geis_attr_name(attr)
+    print("unknown pointer type " + _geis_attr_name(attr))
     return None
 
 
@@ -416,7 +418,7 @@
 
 
 def _attr_type_unknown(attr):
-    print "unknown attr type", _geis_attr_name(attr)
+    print("unknown attr type" + _geis_attr_name(attr))
     return None
 
 

=== modified file 'python/pygeis'
--- python/pygeis	2012-02-23 19:42:24 +0000
+++ python/pygeis	2012-04-02 07:59:19 +0000
@@ -18,6 +18,7 @@
 # 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 print_function, absolute_import, unicode_literals
 
 import argparse
 import geis
@@ -28,39 +29,39 @@
 def _print_gesture(attrs):
     touchset = attrs[geis.GEIS_EVENT_ATTRIBUTE_TOUCHSET]
     groupset = attrs[geis.GEIS_EVENT_ATTRIBUTE_GROUPSET]
-    print "  touches (" + str(len(touchset)) + "):"
+    print("  touches (" + str(len(touchset)) + "):")
     for touch in touchset:
-        print "    ", touch.id(), touch.attrs()
-    print "  groups:"
+        print("    ", touch.id(), touch.attrs())
+    print("  groups:")
     for group in groupset:
-        print "    ", group.id(), ":"
+        print("    ", group.id(), ":")
         for frame in group:
-            print "   frame ", frame.id(), ":"
+            print("   frame ", frame.id(), ":")
             for (k, v) in frame.attrs().iteritems():
-                print "      " + k + ":", v
-            print "      touches: ", frame.touches()
+                print("      " + k + ":", v)
+            print("      touches: ", frame.touches())
 
 def _do_init_complete(event, sub):
-    print "init complete"
+    print("init complete")
     sub.activate()
 
 def _do_device_available(event, sub):
-    print "device available"
+    print("device available")
 
 def _do_gesture_begin(event, sub):
-    print "gesture begin"
+    print("gesture begin")
     _print_gesture(event.attrs())
 
 def _do_gesture_update(event, sub):
-    print "gesture update"
+    print("gesture update")
     _print_gesture(event.attrs())
 
 def _do_gesture_end(event, sub):
-    print "gesture end"
+    print("gesture end")
     _print_gesture(event.attrs())
 
 def _do_other_event(event, sub):
-    print "unknown geis event received"
+    print("unknown geis event received")
 
 _geis_event_action = {
     geis.GEIS_EVENT_INIT_COMPLETE:    _do_init_complete,
@@ -90,7 +91,7 @@
     if event.type() == geis.GEIS_EVENT_CLASS_AVAILABLE:
         gclass = event.attrs()[geis.GEIS_EVENT_ATTRIBUTE_CLASS]
         name = gclass.name()
-        print ".. adding class %s" % name
+        print(".. adding class %s" % name)
         filt = geis.Filter(g, name)
         filt.add_term(geis.GEIS_FILTER_CLASS,
                      (geis.GEIS_CLASS_ATTRIBUTE_NAME, geis.GEIS_FILTER_OP_EQ, name),
@@ -115,7 +116,7 @@
     try:
       options.parse_args()
     except argparse.ArgumentError, ex:
-      print ex
+      print(ex)
       sys.exit(1)
 
     g = geis.Geis(geis.GEIS_INIT_TRACK_DEVICES,

=== modified file 'tools/geisview/classview.py'
--- tools/geisview/classview.py	2011-07-01 14:42:42 +0000
+++ tools/geisview/classview.py	2012-04-02 07:59:19 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 import pygtk
 pygtk.require('2.0')
 import gtk

=== modified file 'tools/geisview/deviceview.py'
--- tools/geisview/deviceview.py	2011-07-01 14:42:42 +0000
+++ tools/geisview/deviceview.py	2012-04-02 07:59:19 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 import pygtk
 pygtk.require('2.0')
 import gtk

=== modified file 'tools/geisview/filter_definition.py'
--- tools/geisview/filter_definition.py	2011-05-18 13:32:13 +0000
+++ tools/geisview/filter_definition.py	2012-04-02 07:59:19 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 import geis
 import geisview.defaults
 import os

=== modified file 'tools/geisview/filter_list.py'
--- tools/geisview/filter_list.py	2011-05-18 13:32:13 +0000
+++ tools/geisview/filter_list.py	2012-04-02 07:59:19 +0000
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 import geisview.defaults
 import geisview.filter_definition
 import os

=== modified file 'tools/geisview/geisview'
--- tools/geisview/geisview	2012-01-26 19:40:29 +0000
+++ tools/geisview/geisview	2012-04-02 07:59:19 +0000
@@ -22,6 +22,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+from __future__ import print_function, absolute_import, unicode_literals
+
 import argparse
 import geis
 import geisview.defaults
@@ -92,7 +94,7 @@
         self._main_window.show()
 
     def _subscribe(self):
-        print "creating subscription"
+        print("creating subscription")
         filt = geis.Filter(self._geis, "> 1 touch")
         filt.add_term(geis.GEIS_FILTER_CLASS,
             (geis.GEIS_GESTURE_ATTRIBUTE_TOUCHES,
@@ -109,16 +111,16 @@
         gtk.main_quit()
 
     def on_menu_item_save(self, widget, data=None):
-        print "on_menu_item_save"
+        print("on_menu_item_save")
 
     def on_menu_item_save_as(self, widget, data=None):
-        print "on_menu_item_save_as"
+        print("on_menu_item_save_as")
 
     def on_edit_clear_events_menu_item(self, widget, data=None):
         self._geis_event_store.clear()
 
     def on_edit_filters_menu_item_activate(self, widget, data=None):
-        print "on_edit_filters_menu_item_activate"
+        print("on_edit_filters_menu_item_activate")
         filter_list_dialog = geisview.filter_list.FilterList()
         filter_list_dialog.run()
 
@@ -176,7 +178,7 @@
         self._geis_event_store.append(frame_row, [touch_label, None, None])
 
         if dev:
-            print "device %s extents %s" % (dev.id(), dev.extents())
+            print("device %s extents %s" % (dev.id(), dev.extents()))
 
 
     def _detail_gesture(self, event_row, attrs):
@@ -300,7 +302,7 @@
         if args.windowid:
             windowid = int(args.windowid, 0)
     except argparse.ArgumentError, ex:
-        print ex
+        print(ex)
         sys.exit(1)
 
     geis_viewer = GeisViewer(args)