r22777 - /trunk/lib/io.py -- April 15, 2014 - 19:30

Author: bugman
Date: Tue Apr 15 19:30:20 2014
New Revision: 22777

URL: http://svn.gna.org/viewcvs/relax?rev=22777&view=rev
Log:
Removed the dependency on the relax dep_check module from the relax library.

This is to further decouple the library from relax.


Modified:
    trunk/lib/io.py

Modified: trunk/lib/io.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/io.py?rev=22777&r1=22776&r2=22777&view=diff
==============================================================================
--- trunk/lib/io.py     (original)
+++ trunk/lib/io.py     Tue Apr 15 19:30:20 2014
@@ -27,10 +27,13 @@
 compression), reading and writing of files, processing of the contents of 
files, etc.
 """
 
-# Dependency check module.
-import dep_check
-
 # Python module imports.
+try:
+    import bz2
+except ImportError:
+    bz2 = None
+    message = sys.exc_info()[1]
+    bz2_module_message = message.args[0]
 from os import devnull
 from os import F_OK, X_OK, access, altsep, getenv, makedirs, pathsep, 
remove, sep
 from os.path import expanduser, basename, splitext, isfile
@@ -439,12 +442,12 @@
     # Bzip2 compression.
     if compress_type == 1 and not search('.bz2$', file_path):
         # Bz2 module exists.
-        if dep_check.bz2_module:
+        if bz2:
             file_path = file_path + '.bz2'
 
         # Switch to gzip compression.
         else:
-            warn(RelaxWarning("Cannot use Bzip2 compression, using gzip 
compression instead.  " + dep_check.bz2_module_message + "."))
+            warn(RelaxWarning("Cannot use Bzip2 compression, using gzip 
compression instead.  " + bz2_module_message + "."))
             compress_type = 2
 
     # Gzip compression.