r24743 - /trunk/dep_check.py -- July 25, 2014 - 13:39

Author: bugman
Date: Fri Jul 25 13:39:33 2014
New Revision: 24743

URL: http://svn.gna.org/viewcvs/relax?rev=24743&view=rev
Log:
Reverted r24736 as this was fatal for the relax information printout - the 
modules are required.

The command used was:
svn merge -r24736:r24735 .

.....
  r24736 | bugman | 2014-07-25 11:20:21 +0200 (Fri, 25 Jul 2014) | 5 lines
  Changed paths:
     M /trunk/dep_check.py
  
  Clean up of the dep_check module - all imported and unused modules are now 
deleted as well.
  
  This cleans up the module namespace of the unused imports.
.....


Modified:
    trunk/dep_check.py

Modified: trunk/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/dep_check.py?rev=24743&r1=24742&r2=24743&view=diff
==============================================================================
--- trunk/dep_check.py  (original)
+++ trunk/dep_check.py  Fri Jul 25 13:39:33 2014
@@ -40,7 +40,6 @@
     if float(numpy.version.version[:3]) < 1.6:
         sys.stderr.write("Version %s of the 'numpy' dependency is not 
supported, numpy >= 1.6 is required.\n" % numpy.version.version)
         sys.exit()
-    del numpy
 except ImportError:
     sys.stderr.write("The dependency 'numpy' has not been installed.\n")
     sys.exit()
@@ -48,7 +47,6 @@
 # Command line option parser.
 try:
     import optparse
-    del optparse
 except ImportError:
     sys.stderr.write("The dependency 'Optik' has not been installed.\n")
     sys.exit()
@@ -56,7 +54,6 @@
 # Minfx python package check.
 try:
     import minfx
-    del minfx
 except ImportError:
     sys.stderr.write("The dependency 'minfx' has not been installed (see 
https://gna.org/projects/minfx/).\n")
     sys.exit()
@@ -66,7 +63,6 @@
 # Bmrblib python package check.
 try:
     import bmrblib
-    del bmrblib
     bmrblib_module = True
 except ImportError:
     bmrblib_module = False
@@ -74,7 +70,6 @@
 # wx module.
 try:
     import wx
-    del wx
     wx_module = True
 except ImportError:
     wx_module = False
@@ -84,7 +79,6 @@
 # epydoc module.
 try:
     import epydoc
-    del epydoc
     epydoc_module = True
 except ImportError:
     epydoc_module = False
@@ -95,8 +89,6 @@
     if 'TERM' in os.environ and os.environ['TERM'] == 'xterm':
         os.environ['TERM'] = 'linux'
     import readline
-    del os
-    del readline
     readline_module = True
 except ImportError:
     readline_module = False
@@ -104,7 +96,6 @@
 # matplotlib module.
 try:
     import matplotlib
-    del matplotlib
     matplotlib_module = True
 except ImportError:
     matplotlib_module = False
@@ -112,7 +103,6 @@
 # runpy module.
 try:
     import runpy
-    del runpy
     runpy_module = True
 except ImportError:
     runpy_module = False
@@ -120,7 +110,6 @@
 # profile module (python development packages required).
 try:
     import profile
-    del profile
     profile_module = True
 except ImportError:
     profile_module = False
@@ -128,7 +117,6 @@
 # profile C module (python development packages required).
 try:
     import cProfile
-    del cProfile
     cprofile_module = True
 except ImportError:
     cprofile_module = False
@@ -136,7 +124,6 @@
 # BZ2 compression module.
 try:
     import bz2
-    del bz2
     bz2_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -146,7 +133,6 @@
 # Gzip compression module.
 try:
     import gzip
-    del gzip
     gzip_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -156,7 +142,6 @@
 # IO module.
 try:
     import io
-    del io
     io_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -166,7 +151,6 @@
 # Scipy import.
 try:
     import scipy
-    del scipy
     scipy_module = True
 except:
     scipy_module = False
@@ -182,7 +166,6 @@
 # mpi4py.
 try:
     import mpi4py
-    del mpi4py
     mpi4py_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -201,7 +184,6 @@
 # PyMOL.
 try:
     import pymol
-    del pymol
     pymol_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -225,12 +207,10 @@
     else:
         xml_version = ''
         xml_type = ''
-    del xml
 
 # subprocess module.
 try:
     import subprocess
-    del subprocess
     subprocess_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -240,7 +220,6 @@
 # ctypes module.
 try:
     import ctypes
-    del ctypes
     ctypes_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -248,7 +227,6 @@
     ctypes_module_message = message.args[0]
 try:
     from ctypes import Structure
-    del Structure
     ctypes_structure_module = True
 except ImportError:
     message = sys.exc_info()[1]
@@ -265,7 +243,6 @@
 try:
     from target_functions import relax_fit
     from target_functions.relax_fit import setup
-    del relax_fit
     del setup
     C_module_exp_fn = True
 except ImportError: