r23628 - in /branches/frame_order_cleanup: ./ relax.py -- June 04, 2014 - 09:37

Author: bugman
Date: Wed Jun  4 09:37:48 2014
New Revision: 23628

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

........
  r23623 | bugman | 2014-06-03 16:30:06 +0200 (Tue, 03 Jun 2014) | 7 lines
  
  Fix for the relax start up detection of missing Python packages.
  
  The dep_check module is now imported first, as it used to be.  This is 
required to check if all
  required modules are installed and to present understandable messages to 
the user rather than
  cryptic ImportError messages with tracebacks.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/relax.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun  4 09:37:48 2014
@@ -1 +1 @@
-/trunk:1-23609
+/trunk:1-23627

Modified: branches/frame_order_cleanup/relax.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/relax.py?rev=23628&r1=23627&r2=23628&view=diff
==============================================================================
--- branches/frame_order_cleanup/relax.py       (original)
+++ branches/frame_order_cleanup/relax.py       Wed Jun  4 09:37:48 2014
@@ -33,11 +33,11 @@
 # Module docstring.
 """The main module for relax execution."""
 
+# Dependency checks.
+import dep_check
+
 # Set up the Python 2 and 3 work-arounds.
 import lib.compat
-
-# Dependency checks.
-import dep_check
 
 # Python modules.
 import numpy