Author: bugman Date: Wed Mar 27 16:01:38 2013 New Revision: 19256 URL: http://svn.gna.org/viewcvs/relax?rev=19256&view=rev Log: Import fixes for the specific_analyses.relax_disp due to the recent trunk package layout redesign. Modified: branches/relax_disp/specific_analyses/relax_disp.py Modified: branches/relax_disp/specific_analyses/relax_disp.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19256&r1=19255&r2=19256&view=diff ============================================================================== --- branches/relax_disp/specific_analyses/relax_disp.py (original) +++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 16:01:38 2013 @@ -32,10 +32,10 @@ from dep_check import C_module_exp_fn from api_base import API_base from api_common import API_common -from generic_fns import pipes -from generic_fns.mol_res_spin import exists_mol_res_spin_data, generate_spin_id, return_spin, spin_loop +from lib.errors import RelaxError, RelaxFuncSetupError, RelaxLenError, RelaxNoModelError, RelaxNoSequenceError from minfx.generic import generic_minimise -from relax_errors import RelaxError, RelaxFuncSetupError, RelaxLenError, RelaxNoModelError, RelaxNoSequenceError +from pipe_control import pipes +from pipe_control.mol_res_spin import exists_mol_res_spin_data, generate_spin_id, return_spin, spin_loop # C modules. if C_module_exp_fn: