gnucash maint: Multiple changes pushed

John Ralls jralls at code.gnucash.org
Mon Apr 15 17:26:41 EDT 2019


Updated	 via  https://github.com/Gnucash/gnucash/commit/0251d044 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/5a73b9af (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cc7673cc (commit)
	 via  https://github.com/Gnucash/gnucash/commit/bf9ec70f (commit)
	 via  https://github.com/Gnucash/gnucash/commit/d93d4efd (commit)
	 via  https://github.com/Gnucash/gnucash/commit/af3b9bf2 (commit)
	from  https://github.com/Gnucash/gnucash/commit/fc355958 (commit)



commit 0251d044b5b4c3123752c0e85d80ee0f319bf72f
Merge: fc355958b 5a73b9afd
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 15 14:25:49 2019 -0700

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


commit 5a73b9afd4010546c36c4761a098747bc7d8fd5c
Author: c-holtermann <mail at c-holtermann.net>
Date:   Sat Apr 13 18:16:12 2019 +0200

    syntax change to exec

diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index d284e8b37..8458d343d 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -155,7 +155,7 @@ class Shell:
                     # 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()

commit cc7673ccc89ebcdfa22dd223de1fd5a57c6f6764
Author: c-holtermann <mail at c-holtermann.net>
Date:   Sat Apr 13 18:15:51 2019 +0200

    filter needs to be converted to list.
    
    Method replace is missing. Needs to be fixed.

diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index b5196b015..d284e8b37 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -63,9 +63,9 @@ class Shell:
         """
         
         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 = []

commit bf9ec70f27e3e86e5a901e2a86813369114c06de
Author: c-holtermann <mail at c-holtermann.net>
Date:   Sat Apr 13 18:16:32 2019 +0200

    reflect syntax change to sys tracebacks

diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index 6797b5b39..b5196b015 100644
--- a/gnucash/python/pycons/shell.py
+++ b/gnucash/python/pycons/shell.py
@@ -163,10 +163,10 @@ class Shell:
                 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()

commit d93d4efd82df063a3baa868774c1c6f35da10aed
Author: c-holtermann <mail at c-holtermann.net>
Date:   Sat Apr 13 18:13:19 2019 +0200

    Import necessary module gdk

diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index ea418344f..411dcdc05 100644
--- a/gnucash/python/pycons/console.py
+++ b/gnucash/python/pycons/console.py
@@ -35,6 +35,7 @@ import gi
 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

commit af3b9bf215d41216fd9f7578e678d3ddaefe344e
Author: c-holtermann <mail at c-holtermann.net>
Date:   Mon Apr 15 22:00:27 2019 +0200

    change shebang to python3

diff --git a/gnucash/python/pycons/console.py b/gnucash/python/pycons/console.py
index 760c498c2..ea418344f 100644
--- a/gnucash/python/pycons/console.py
+++ b/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.
diff --git a/gnucash/python/pycons/ishell.py b/gnucash/python/pycons/ishell.py
index 371f32c4a..30e6ea404 100644
--- a/gnucash/python/pycons/ishell.py
+++ b/gnucash/python/pycons/ishell.py
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Adapted from:
 #
diff --git a/gnucash/python/pycons/shell.py b/gnucash/python/pycons/shell.py
index 33cff5359..6797b5b39 100644
--- a/gnucash/python/pycons/shell.py
+++ b/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.



Summary of changes:
 gnucash/python/pycons/console.py |  3 ++-
 gnucash/python/pycons/ishell.py  |  2 +-
 gnucash/python/pycons/shell.py   | 14 +++++++-------
 3 files changed, 10 insertions(+), 9 deletions(-)



More information about the gnucash-changes mailing list