Author: bugman
Date: Tue Nov 11 16:21:12 2014
New Revision: 26528
URL: http://svn.gna.org/viewcvs/relax?rev=26528&view=rev
Log:
Python 3 improvements - changed how the Python 3 absent builtins.unicode()
function is handled.
The aliased builtins.str() function is now referenced as lib.compat.unicode().
The Python 2
__builtin__.unicode() function is also aliased to lib.compat.unicode(). The
GUI using this function
now import it from lib.compat.
Modified:
trunk/gui/spin_viewer/containers.py
trunk/gui/string_conv.py
trunk/lib/compat.py
Modified: trunk/gui/spin_viewer/containers.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/spin_viewer/containers.py?rev=26528&r1=26527&r2=26528&view=diff
==============================================================================
--- trunk/gui/spin_viewer/containers.py (original)
+++ trunk/gui/spin_viewer/containers.py Tue Nov 11 16:21:12 2014
@@ -31,6 +31,7 @@
from graphics import WIZARD_IMAGE_PATH
from gui.misc import bitmap_setup
from gui.string_conv import str_to_gui
+from lib.compat import unicode
from pipe_control.mol_res_spin import return_spin
Modified: trunk/gui/string_conv.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/string_conv.py?rev=26528&r1=26527&r2=26528&view=diff
==============================================================================
--- trunk/gui/string_conv.py (original)
+++ trunk/gui/string_conv.py Tue Nov 11 16:21:12 2014
@@ -28,7 +28,7 @@
from numpy import ndarray
# relax module imports.
-from lib.compat import u
+from lib.compat import u, unicode
from status import Status; status = Status()
Modified: trunk/lib/compat.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/lib/compat.py?rev=26528&r1=26527&r2=26528&view=diff
==============================================================================
--- trunk/lib/compat.py (original)
+++ trunk/lib/compat.py Tue Nov 11 16:21:12 2014
@@ -373,6 +373,9 @@
else:
os.devnull = None
+ # The unicode conversion function - essential for the GUI in Python 2.
+ unicode = builtins.unicode
+
# Unicode string handling.
from codecs import unicode_escape_decode
def u(text):
@@ -390,7 +393,7 @@
# Python 3 work-arounds.
if PY_VERSION == 3:
# The unicode conversion function - essential for the GUI in Python 2.
- builtins.unicode = builtins.str
+ unicode = builtins.str
# Unicode string handling.
def u(text):
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
