Support Python 2.7 and GTK+2

diff --git a/vis/config.py b/vis/config.py
index b2cfb2f9a833ee13e471f456e30c1ca1866b4686..be79e485c0a8a64ce752730c0f9cb608360fdcb8 100644 (file)
--- a/vis/config.py
+++ b/vis/config.py
@@ -1,4 +1,9 @@
-from configparser import ConfigParser
+import sys
+
+if sys.version_info<(3,0,0):
+       from ConfigParser import ConfigParser
+else:
+       from configparser import ConfigParser
 
 class Config:
        # Attributes

diff --git a/vis/test.py b/vis/test.py
index c3e7ea2f44fa808fe01e49616aa078eb8685eab1..e18191cb5673462c7eb6bca327813e6d42caa23f 100644 (file)
--- a/vis/test.py
+++ b/vis/test.py
@@ -9,8 +9,12 @@ import time
 import datetime
 import random
 
-from gi.repository import Gtk
-from gi.repository import GLib
+if sys.version_info<(3,0,0):
+       import pygtk as PyGtk
+       import gtk   as Gtk
+else:
+       from gi.repository import Gtk
+       from gi.repository import GLib
 
 from serial import Serial
 

diff --git a/vis/visual.py b/vis/visual.py
index 978eb977a7d7fde4173f96f61c7854ef66c7c64a..5580b5b47700c80359c733d69aade5b32d1fa01a 100644 (file)
--- a/vis/visual.py
+++ b/vis/visual.py
@@ -1,7 +1,19 @@
 #!/usr/bin/env python
 
-from gi.repository import Gtk
-from gi.repository import GLib
+import sys
+
+if sys.version_info<(3,0,0):
+       import pygtk as PyGtk
+       import gtk   as Gtk
+       import gtk   as GLib
+else:
+       from gi.repository import Gtk
+       from gi.repository import GLib
+
+if sys.version_info<(3,0,0):
+       ICON_SIZE_BUTTON = Gtk.ICON_SIZE_BUTTON
+else:
+       ICON_SIZE_BUTTON = Gtk.IconSize.BUTTON
 
 class Visual:
        def __init__(self, config, device, logger):
@@ -142,7 +154,7 @@ class Visual:
                        con = self.builder.get_object(name + '_con')
                        img = Gtk.STOCK_YES if state else Gtk.STOCK_NO
                        btn.set_active(state)
-                       con.set_from_stock(img, Gtk.IconSize.BUTTON)
+                       con.set_from_stock(img, ICON_SIZE_BUTTON)
 
                check(self.device.running(), "serial")
                check(self.logger.running(), "xively")