r17929 - in /branches/relax_disp: ./ dep_check.py -- October 20, 2012 - 17:41

Author: bugman
Date: Sat Oct 20 17:41:24 2012
New Revision: 17929

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

........
  r17925 | bugman | 2012-10-20 13:13:10 +0200 (Sat, 20 Oct 2012) | 7 lines
  
  Work around for a numpy bug triggered by scons and the import of 
Scientific.Visualization.VMD.
  
  For details, see the thread started by Jack Howarth (howarth att bromo dot 
med dot uc dot edu)
  started at http://thread.gmane.org/gmane.science.nmr.relax.devel/3663 
(Message ID:
  <20121019140023.GA26861@xxxxxxxxxxxxxxxx>).
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/dep_check.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Oct 20 17:41:24 2012
@@ -1,1 +1,1 @@
-/trunk:1-17919
+/trunk:1-17927

Modified: branches/relax_disp/dep_check.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/dep_check.py?rev=17929&r1=17928&r2=17929&view=diff
==============================================================================
--- branches/relax_disp/dep_check.py (original)
+++ branches/relax_disp/dep_check.py Sat Oct 20 17:41:24 2012
@@ -157,7 +157,7 @@
     from Scientific.Visualization import VMD    # This requires Numeric to 
be installed (at least in Scientific 2.7.8).
     del VMD
     vmd_module = True
-except ImportError:
+except:
     vmd_module = False
 
 # mpi4py.