r15866 - /1.3/info.py -- May 02, 2012 - 11:43

Author: bugman
Date: Wed May  2 11:43:09 2012
New Revision: 15866

URL: http://svn.gna.org/viewcvs/relax?rev=15866&view=rev
Log:
The XML system information print out now uses the dep_check module XML data.


Modified:
    1.3/info.py

Modified: 1.3/info.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/info.py?rev=15866&r1=15865&r2=15866&view=diff
==============================================================================
--- 1.3/info.py (original)
+++ 1.3/info.py Wed May  2 11:43:09 2012
@@ -438,18 +438,12 @@
 
         # XML.
         package.append('xml')
-        try:
-            import xml
-            status.append(True)
-        except:
-            status.append(False)
-        if status[-1] and hasattr(xml, '__version__'):
-            version.append(xml.__version__)
+        status.append(dep_check.xml_module)
+        if dep_check.xml_module:
+            version.append("%s (%s)" % (dep_check.xml_version, 
dep_check.xml_type))
+            path.append(dep_check.xml.__file__)
         else:
             version.append('')
-        if status[-1] and hasattr(xml, '__file__'):
-            path.append(xml.__file__)
-        else:
             path.append('')
 
         # XML minidom.