r17615 - in /trunk: data/__init__.py generic_fns/pipes.py -- September 28, 2012 - 18:58

Author: bugman
Date: Fri Sep 28 18:58:47 2012
New Revision: 17615

URL: http://svn.gna.org/viewcvs/relax?rev=17615&view=rev
Log:
Bug fix for a problem introduced in the last commit.


Modified:
    trunk/data/__init__.py
    trunk/generic_fns/pipes.py

Modified: trunk/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/__init__.py?rev=17615&r1=17614&r2=17615&view=diff
==============================================================================
--- trunk/data/__init__.py (original)
+++ trunk/data/__init__.py Fri Sep 28 18:58:47 2012
@@ -26,7 +26,7 @@
 # Python module imports.
 try:
     import __builtin__ as builtins    # Python 2 import.
-else:
+except ImportError:
     import builtins    # Python 3 import.
 from re import search
 from sys import stderr

Modified: trunk/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/pipes.py?rev=17615&r1=17614&r2=17615&view=diff
==============================================================================
--- trunk/generic_fns/pipes.py (original)
+++ trunk/generic_fns/pipes.py Fri Sep 28 18:58:47 2012
@@ -26,7 +26,7 @@
 # Python module imports
 try:
     import __builtin__ as builtins    # Python 2 import.
-else:
+except ImportError:
     import builtins    # Python 3 import.
 import sys