Merge Christoph Holtermann's 'Pr pycons2to3' into maint.

gnucash/python/pycons/console.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Copyright (c) 2008, Nicolas Rougier
 # All rights reserved.
@@ -35,6 +35,7 @@
 gi.require_version('Gtk', '3.0')
 from gi.repository import GObject
 from gi.repository import Gtk
+from gi.repository import Gdk
 from gi.repository import Pango
 import io
 import pycons.shell as shell

gnucash/python/pycons/ishell.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Adapted from:
 #

gnucash/python/pycons/shell.py

@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Copyright (c) 2008, Nicolas Rougier
 # All rights reserved.
@@ -63,9 +63,9 @@ def is_balanced (self, line):
         """
 
         s = line
-        s = filter(lambda x: x in '()[]{}"\'', s)
-        s = s.replace ("'''", "'")
-        s = s.replace ('"""', '"')
+        s = list(filter(lambda x: x in '()[]{}"\'', s))
+        # s = s.replace ("'''", "'")
+        # s = s.replace ('"""', '"')
         instring = False
         brackets = {'(':')', '[':']', '{':'}', '"':'"', '\'':'\''}
         stack = []
@@ -155,18 +155,18 @@ def execute (self, console):
                     # Command output
                     print(repr(r))
             except SyntaxError:
-                exec(self.command in self.globals)
+                exec(str(self.command), self.globals)
         except:
             if hasattr (sys, 'last_type') and sys.last_type == SystemExit:
                 console.quit()
             elif hasattr (sys, 'exc_type') and sys.exc_type == SystemExit:
                 console.quit()
             else:
                 try:
-                    tb = sys.exc_traceback
+                    tb = sys.exc_info()[2]
                     if tb:
                         tb=tb.tb_next
-                    traceback.print_exception(sys.exc_type, sys.exc_value, tb)
+                    traceback.print_exception(sys.exc_info()[0], sys.exc_info()[1], tb)
                 except:
                     sys.stderr, console.stderr = console.stderr, sys.stderr
                     traceback.print_exc()