r17601 - /trunk/dep_check.py -- September 28, 2012 - 17:17

Author: bugman
Date: Fri Sep 28 17:17:05 2012
New Revision: 17601

URL: http://svn.gna.org/viewcvs/relax?rev=17601&view=rev
Log:
More exception handling changes to be Python 2.4+ compatible.


Modified:
    trunk/dep_check.py

Modified: trunk/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=17601&r1=17600&r2=17601&view=diff
==============================================================================
--- trunk/dep_check.py (original)
+++ trunk/dep_check.py Fri Sep 28 17:17:05 2012
@@ -104,7 +104,8 @@
 try:
     import bz2
     bz2_module = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     bz2_module = False
     bz2_module_message = message.args[0]
 
@@ -112,7 +113,8 @@
 try:
     import gzip
     gzip_module = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     gzip_module = False
     gzip_module_message = message.args[0]
 
@@ -122,7 +124,8 @@
     from os import devnull
     del devnull
     devnull_import = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     devnull_import = False
     devnull_import_message = message.args[0]
 
@@ -152,7 +155,8 @@
 try:
     import mpi4py
     mpi4py_module = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     mpi4py_module = False
 
     # The error message.
@@ -169,14 +173,16 @@
 try:
     import pymol
     pymol_module = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     pymol_module = False
 
 # XML.
 try:
     import xml
     xml_module = True
-except ImportError, message:
+except ImportError:
+    message = sys.exc_info()[1]
     xml_module = False
 if xml_module:
     # The XML version mess!
@@ -201,7 +207,7 @@
     from maths_fns.relax_fit import setup
     del setup
     C_module_exp_fn = True
-except ImportError, message:
+except ImportError:
     # The OS.
     system = platform.system()
 
@@ -214,7 +220,8 @@
 
     # Show the full error.
     else:
-        C_module_exp_fn_mesg = "ImportError: " + message[0] + "\nRelaxation 
curve fitting is unavailable, try compiling the C modules."
+        message = sys.exc_info()[1]
+        C_module_exp_fn_mesg = "ImportError: " + repr(message) + 
"\nRelaxation curve fitting is unavailable, try compiling the C modules."
 
     # Set the flag.
     C_module_exp_fn = False