cisstInteractive: more updates for Python 3

Author: pkazanzides

cisstInteractive/code/irepy/ireLogCtrl.py

@@ -96,12 +96,12 @@ def __init__(self, parent, id, title='',
             self.ChannelMask.Enable(False)
 
         self.HeaderSizer = wx.BoxSizer(wx.HORIZONTAL)
-        self.HeaderSizer.Add(self.Text, 0, wx.ALIGN_LEFT)
+        self.HeaderSizer.Add(self.Text, 0, wx.ALIGN_TOP)
         self.HeaderSizer.Add((0,0),3)   # Add a stretchable space
-        self.HeaderSizer.Add(self.EnableBox, 0, wx.ALIGN_LEFT)
+        self.HeaderSizer.Add(self.EnableBox, 0, wx.ALIGN_TOP)
         self.HeaderSizer.Add((0,0),3)   # Add a stretchable space
-        self.HeaderSizer.Add(self.ChannelMaskText, 0, wx.ALIGN_RIGHT)
-        self.HeaderSizer.Add(self.ChannelMask, 0, wx.ALIGN_LEFT)
+        self.HeaderSizer.Add(self.ChannelMaskText, 0, wx.ALIGN_TOP)
+        self.HeaderSizer.Add(self.ChannelMask, 0, wx.ALIGN_TOP)
         self.HeaderSizer.Add((0,0),1)   # Add a smaller stretchable space
 
         self.logText = wx.TextCtrl(self, -1, style=style)

cisstInteractive/code/irepy/ireMain.py

@@ -36,14 +36,17 @@
 #------------------------------------------------------
 import os, sys, time, types, warnings
 if sys.version_info.major == 2:
-    import imp, cPickle, exceptions
+    import cPickle as pickle
+    import imp
+else:
+    import pickle
+    import importlib.util
 import string as String
 
 #-----------------------------------------------------
 # Ignore Python future warnings (nuissances)
 #-----------------------------------------------------
-if sys.version_info.major == 2:
-    warnings.simplefilter('ignore', exceptions.FutureWarning)
+warnings.simplefilter('ignore', FutureWarning)
 
 #------------------------------------------------------
 # Import what we need from the wx toolkit
@@ -597,14 +600,14 @@ def GetTypeString(self, _Str):
     def SaveHistoryToFile(self):
         cmdlist = self.CommandHistoryListCtrl.GetAllItems()
         f = open(self.HISTORY_FILENAME, 'w')
-        cPickle.dump(cmdlist, f)
+        pickle.dump(cmdlist, f)
 
     def LoadHistoryFromFile(self, fn=HISTORY_FILENAME):
         Data = []
         if os.path.isfile(fn):
             try:
-                Data = cPickle.load(open(fn))
-            except exceptions.Exception as error:
+                Data = pickle.load(open(fn))
+            except Exception as error:
                 msgdlg = wx.MessageDialog(self, str(error), "Load History", wx.OK | wx.ICON_ERROR)
                 msgdlg.ShowModal()
                 msgdlg.Destroy()
@@ -687,13 +690,13 @@ def TruncateHistoryFile(self):
             # write the command file up to the selected line into the named file
             # fetch any existing list first and append to it
             try:
-                archlist = cPickle.load(open(fn))
+                archlist = pickle.load(open(fn))
             except IOError:
                 archlist = []
             n=0
             for n in range(choice):
                 archlist.append( cmdlist[n] )
-            cPickle.dump( archlist, open(fn, 'w'))
+            pickle.dump( archlist, open(fn, 'w'))
             text = "Your command history was archived to " + fn
             msgdlg = wx.MessageDialog(self, text, title, wx.OK | wx.ICON_INFORMATION)
             msgdlg.ShowModal()
@@ -987,10 +990,15 @@ def OnUpdateMenu(self, event):
 
 # ModuleAvailable:  returns true if the module 'name' is present on the path.
 def ModuleAvailable(name):
-    try:
-       imp.find_module(name)
-    except ImportError:
-       return False
+    if sys.version_info.major == 2:
+        try:
+            imp.find_module(name)
+        except ImportError:
+            return False
+    else:
+        spec = importlib.util.find_spec(name)
+        if not spec:
+            return False
     return True
 
 def launchIrePython():

cisstInteractive/code/irepy/ireWorkspace.py

@@ -25,17 +25,18 @@
 
 import sys
 if sys.version_info.major == 2:
-    import exceptions
-    import cPickle
+    import cPickle as pickle
+else:
+    import pickle
 
 class NoOutput:
     def write(self, String):
         pass
 
 def IsPicklable(Object):
     try:
-        cPickle.dump(Object, NoOutput())
-    except exceptions.Exception as error: #cPickle.PicklingError, error:
+        pickle.dump(Object, NoOutput())
+    except Exception as error: #pickle.PicklingError, error:
         return False
     return True
 
@@ -49,15 +50,15 @@ def SaveWorkspaceToFile(ObjectDictionary, File):
     for ObjectName in ObjectDictionary:
         if IsPicklable(ObjectDictionary[ObjectName]):
             Workspace.update({ObjectName:ObjectDictionary[ObjectName]})
-    cPickle.dump(Workspace,File)
+    pickle.dump(Workspace,File)
 
 #------------------------------------------------------
 # LoadWorkspaceFile
 #
 # Load workspace variables and statements from a file
 #------------------------------------------------------
 def LoadWorkspaceFile(ObjectDictionary, File):
-    Workspace = cPickle.load(File)
+    Workspace = pickle.load(File)
     for Variable in Workspace:
         ObjectDictionary[Variable] = Workspace[Variable]
 
@@ -75,7 +76,7 @@ def main():
     v1 = v2 = None
     print('v1 = ', v1, '\nv2 = ', v2)
     LoadFile(open('workspace'))
-    Workspace = cPickle.load(open('workspace'))
+    Workspace = pickle.load(open('workspace'))
     for Variable in Workspace:
         exec(Variable + " = Workspace['" + Variable + "']")
     print('v1 = ', v1, '\nv2 = ', v2)