Author: bugman Date: Sun Mar 24 16:15:32 2013 New Revision: 19113 URL: http://svn.gna.org/viewcvs/relax?rev=19113&view=rev Log: Import fixes for the recent rearrangements. Modified: trunk/pipe_control/structure/internal.py trunk/pipe_control/structure/mass.py Modified: trunk/pipe_control/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/internal.py?rev=19113&r1=19112&r2=19113&view=diff ============================================================================== --- trunk/pipe_control/structure/internal.py (original) +++ trunk/pipe_control/structure/internal.py Sun Mar 24 16:15:32 2013 @@ -36,12 +36,12 @@ from pipe_control import pipes from pipe_control.mol_res_spin import spin_loop from pipe_control.mol_res_spin import Selection -from pipe_control.structure import pdb_read, pdb_write from pipe_control.structure.api_base import Base_struct_API, ModelList, Displacements from lib import regex from lib.check_types import is_float from lib.errors import RelaxError, RelaxNoneIntError, RelaxNoPdbError from lib.io import file_root, open_read_file +from lib.structure import pdb_read, pdb_write from lib.warnings import RelaxWarning Modified: trunk/pipe_control/structure/mass.py URL: http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/mass.py?rev=19113&r1=19112&r2=19113&view=diff ============================================================================== --- trunk/pipe_control/structure/mass.py (original) +++ trunk/pipe_control/structure/mass.py Sun Mar 24 16:15:32 2013 @@ -25,7 +25,7 @@ # relax module imports. from pipe_control.mol_res_spin import return_molecule, return_residue, return_spin from lib.errors import RelaxNoPdbError -from lib import mass +from lib.structure import mass from lib.warnings import RelaxWarning