r15456 - in /branches/frame_order_testing: ./ multi/api.py multi/misc.py -- March 07, 2012 - 13:42

Author: bugman
Date: Wed Mar  7 13:42:32 2012
New Revision: 15456

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

........
  r15455 | bugman | 2012-03-07 13:42:05 +0100 (Wed, 07 Mar 2012) | 3 lines
  
  More important import fixes for the multi-processor package.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/multi/api.py
    branches/frame_order_testing/multi/misc.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Mar  7 13:42:32 2012
@@ -1,1 +1,1 @@
-/1.3:1-15453
+/1.3:1-15455

Modified: branches/frame_order_testing/multi/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/api.py?rev=15456&r1=15455&r2=15456&view=diff
==============================================================================
--- branches/frame_order_testing/multi/api.py (original)
+++ branches/frame_order_testing/multi/api.py Wed Mar  7 13:42:32 2012
@@ -29,11 +29,9 @@
 
 # Python module imports.
 import sys
-import traceback, textwrap
 
 # relax module imports.
 from multi.misc import raise_unimplemented
-from multi.processor_io import Redirect_text
 
 
 class Result(object):

Modified: branches/frame_order_testing/multi/misc.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/multi/misc.py?rev=15456&r1=15455&r2=15456&view=diff
==============================================================================
--- branches/frame_order_testing/multi/misc.py (original)
+++ branches/frame_order_testing/multi/misc.py Wed Mar  7 13:42:32 2012
@@ -29,6 +29,7 @@
 
 # Python module imports.
 import sys
+import traceback, textwrap
 
 
 def import_module(module_path):