r18800 - in /branches/frame_order_testing: ./ dep_check.py info.py relax_io.py -- March 12, 2013 - 16:21

Author: bugman
Date: Tue Mar 12 16:21:43 2013
New Revision: 18800

URL: http://svn.gna.org/viewcvs/relax?rev=18800&view=rev
Log:
Merged revisions 18799 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r18799 | bugman | 2013-03-12 16:20:49 +0100 (Tue, 12 Mar 2013) | 6 lines
  
  Eliminated the os.devnull import flag dep_check.devnull_import.
  
  This is not needed as the compat module defines os.devnull for Python <= 
2.3.  The devnull module is
  no longer part of the relax information printout.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/dep_check.py
    branches/frame_order_testing/info.py
    branches/frame_order_testing/relax_io.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Mar 12 16:21:43 2013
@@ -1,1 +1,1 @@
-/trunk:1-18797
+/trunk:1-18799

Modified: branches/frame_order_testing/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/dep_check.py?rev=18800&r1=18799&r2=18800&view=diff
==============================================================================
--- branches/frame_order_testing/dep_check.py (original)
+++ branches/frame_order_testing/dep_check.py Tue Mar 12 16:21:43 2013
@@ -133,17 +133,6 @@
     message = sys.exc_info()[1]
     io_module = False
     io_module_message = message.args[0]
-
-# Devnull.
-try:
-    import os
-    from os import devnull
-    del devnull
-    devnull_import = True
-except ImportError:
-    message = sys.exc_info()[1]
-    devnull_import = False
-    devnull_import_message = message.args[0]
 
 # Scipy import.
 try:

Modified: branches/frame_order_testing/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=18800&r1=18799&r2=18800&view=diff
==============================================================================
--- branches/frame_order_testing/info.py (original)
+++ branches/frame_order_testing/info.py Tue Mar 12 16:21:43 2013
@@ -459,15 +459,6 @@
         version.append('')
         try:
             path.append(dep_check.io.__file__)
-        except:
-            path.append('')
-
-        # devnull.
-        package.append('os.devnull')
-        status.append(dep_check.devnull_import)
-        version.append('')
-        try:
-            path.append(dep_check.os.__file__)
         except:
             path.append('')
 

Modified: branches/frame_order_testing/relax_io.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/relax_io.py?rev=18800&r1=18799&r2=18800&view=diff
==============================================================================
--- branches/frame_order_testing/relax_io.py (original)
+++ branches/frame_order_testing/relax_io.py Tue Mar 12 16:21:43 2013
@@ -30,8 +30,7 @@
 import dep_check
 
 # Python module imports.
-if dep_check.devnull_import:
-    from os import devnull
+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
 from re import match, search
@@ -409,10 +408,6 @@
 
     # The null device.
     if search('devnull', file_name):
-        # Devnull could not be imported!
-        if not dep_check.devnull_import:
-            raise RelaxError(dep_check.devnull_import_message + ".  To use 
devnull, please upgrade to Python >= 2.4.")
-
         # Print out.
         if verbosity:
             print("Opening the null device file for writing.")