From 7a43e3447b1787ed7dad5233996f474adb2aa4fb Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Tue, 4 Feb 2014 06:54:03 +0000 Subject: [PATCH] Support Python 2.7 and GTK+2 --- vis/config.py | 7 ++++++- vis/test.py | 8 ++++++-- vis/visual.py | 18 +++++++++++++++--- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/vis/config.py b/vis/config.py index b2cfb2f..be79e48 100644 --- 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 c3e7ea2..e18191c 100644 --- 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 978eb97..5580b5b 100644 --- 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") -- 2.43.2