--- frescobaldi_app/menu.py.orig	2016-04-21 23:00:30 UTC

+++ frescobaldi_app/menu.py

@@ -23,11 +23,12 @@ Frescobaldi main menu.

 from __future__ import unicode_literals

-try:

+import sys

+if sys.version_info >= (3, 0):

     import builtins # py3

-except ImportError:

+else:

     import __builtin__ as builtins # py2

-

+    

 from PyQt4.QtCore import QSettings

 from PyQt4.QtGui import QMenu

--- frescobaldi_app/po/__init__.py.orig	2016-04-21 23:00:30 UTC

+++ frescobaldi_app/po/__init__.py

@@ -21,9 +21,10 @@

 Internationalization of Frescobaldi.

 """

-try:

+import sys

+if sys.version_info >= (3, 0):

     import builtins # py3

-except ImportError:

+else:

     import __builtin__ as builtins # py2

 import os

--- frescobaldi_app/snippet/builtin.py.orig	2016-04-21 23:00:30 UTC

+++ frescobaldi_app/snippet/builtin.py

@@ -23,9 +23,10 @@ Builtin snippets.

 from __future__ import unicode_literals

-try:

+import sys

+if sys.version_info >= (3, 0):

     import builtins # py3

-except ImportError:

+else:

     import __builtin__ as builtins # py2

 import collections

--- frescobaldi_app/snippet/expand.py.orig	2016-04-21 23:00:30 UTC

+++ frescobaldi_app/snippet/expand.py

@@ -23,9 +23,10 @@ Expand variables like $DATE, $LILYPOND_V

 from __future__ import unicode_literals

-try:

+import sys

+if sys.version_info >= (3, 0):

     import builtins # py3

-except ImportError:

+else:

     import __builtin__ as builtins # py2

 import time

--- frescobaldi_app/snippet/highlight.py.orig	2016-04-21 23:00:30 UTC

+++ frescobaldi_app/snippet/highlight.py

@@ -23,9 +23,10 @@ Highlighter for the snippet editor and v

 from __future__ import unicode_literals

-try:

+import sys

+if sys.version_info >= (3, 0):

     import builtins # py3

-except ImportError:

+else:

     import __builtin__ as builtins # py2

 import keyword