Port to python 3

Port code to python 3 yet remain backward compatible to python 2.
This port is in preparation for yocto 2.4 upgrade.

Partially resolves openbmc/openbmc#2920

Change-Id: If174ce9444bde4e21fb086764f4def017e423201
Signed-off-by: CamVan Nguyen <ctnguyen@us.ibm.com>

2 files changed, 12 insertions, 8 deletions

diff --git a/pysystemmgr/obmc/system/__init__.py b/pysystemmgr/obmc/system/__init__.py
index 03dc235..7bcea9e 100644
--- a/pysystemmgr/obmc/system/__init__.py
+++ b/pysystemmgr/obmc/system/__init__.py
@@ -18,8 +18,8 @@ GPIO_BASE = find_gpio_base()
 
 
 def convertGpio(name):
-    offset = int(filter(str.isdigit, name))
-    port = filter(str.isalpha, name.upper())
+    offset = int(''.join(list(filter(str.isdigit, name))))
+    port = list(filter(str.isalpha, name.upper()))
     a = ord(port[-1]) - ord('A')
     if len(port) > 1:
         a += 26
diff --git a/pysystemmgr/system_manager.py b/pysystemmgr/system_manager.py
index 77d36a3..cd13f7b 100644
--- a/pysystemmgr/system_manager.py
+++ b/pysystemmgr/system_manager.py
@@ -1,6 +1,10 @@
 #!/usr/bin/env python
 
-import gobject
+# TODO: openbmc/openbmc#2994 remove python 2 support
+try:  # python 2
+    import gobject
+except ImportError:  # python 3
+    from gi.repository import GObject as gobject
 import dbus
 import dbus.service
 import dbus.mainloop.glib
@@ -21,7 +25,7 @@ class SystemManager(DbusProperties, DbusObjectManager):
             object_path=obj_name)
         self.bus = bus
 
-        print "SystemManager Init Done"
+        print("SystemManager Init Done")
 
     @dbus.service.method(DBUS_NAME, in_signature='s', out_signature='sis')
     def gpioInit(self, name):
@@ -31,7 +35,7 @@ class SystemManager(DbusProperties, DbusObjectManager):
         if name not in System.GPIO_CONFIG:
             # TODO: Better error handling
             msg = "ERROR: "+name+" not found in GPIO config table"
-            print msg
+            print(msg)
             raise Exception(msg)
         else:
 
@@ -44,7 +48,7 @@ class SystemManager(DbusProperties, DbusObjectManager):
                     gpio_num = obmc.system.convertGpio(gpio['gpio_pin'])
                 else:
                     msg = "ERROR: SystemManager - GPIO lookup failed for "+name
-                    print msg
+                    print(msg)
                     raise Exception(msg)
 
             if (gpio_num != -1):
@@ -69,7 +73,7 @@ class SystemManager(DbusProperties, DbusObjectManager):
         r = [power_good_in, latch_out, power_up_outs, reset_outs,
              pci_reset_outs, fsi_data, fsi_clk, fsi_enable, cronus_sel,
              optionals]
-        print "Power GPIO config: " + str(r)
+        print("Power GPIO config: " + str(r))
         return r
 
 
@@ -81,7 +85,7 @@ if __name__ == '__main__':
     obj.unmask_signals()
     name = dbus.service.BusName(DBUS_NAME, bus)
 
-    print "Running SystemManager"
+    print("Running SystemManager")
     mainloop.run()
 
 # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4