r19125 - in /trunk: lib/structure/internal/ pipe_control/structure/ -- March 24, 2013 - 17:29

Author: bugman
Date: Sun Mar 24 17:29:08 2013
New Revision: 19125

URL: http://svn.gna.org/viewcvs/relax?rev=19125&view=rev
Log:
Import fixes for the structural object module rearrangements.


Modified:
    trunk/lib/structure/internal/models.py
    trunk/lib/structure/internal/molecules.py
    trunk/pipe_control/structure/api_base.py
    trunk/pipe_control/structure/internal.py

Modified: trunk/lib/structure/internal/models.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/models.py?rev=19125&r1=19124&r2=19125&view=diff
==============================================================================
--- trunk/lib/structure/internal/models.py (original)
+++ trunk/lib/structure/internal/models.py Sun Mar 24 17:29:08 2013
@@ -28,6 +28,7 @@
 # relax module import.
 from data_store.relax_xml import fill_object_contents
 from lib.errors import RelaxError, RelaxFromXMLNotEmptyError
+from lib.structure.internal.molecules import MolList
 
 
 class ModelList(list):

Modified: trunk/lib/structure/internal/molecules.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/lib/structure/internal/molecules.py?rev=19125&r1=19124&r2=19125&view=diff
==============================================================================
--- trunk/lib/structure/internal/molecules.py (original)
+++ trunk/lib/structure/internal/molecules.py Sun Mar 24 17:29:08 2013
@@ -24,6 +24,7 @@
 
 # relax module import.
 from lib.errors import RelaxError, RelaxFromXMLNotEmptyError
+from lib.structure import pdb_read
 
 
 class MolContainer:

Modified: trunk/pipe_control/structure/api_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/api_base.py?rev=19125&r1=19124&r2=19125&view=diff
==============================================================================
--- trunk/pipe_control/structure/api_base.py (original)
+++ trunk/pipe_control/structure/api_base.py Sun Mar 24 17:29:08 2013
@@ -40,6 +40,7 @@
 from lib.structure.superimpose import kabsch
 from lib.errors import RelaxError, RelaxFileError, 
RelaxFromXMLNotEmptyError, RelaxImplementError
 from lib.io import file_root
+from lib.structure.internal.models import ModelList, ModelContainer
 from lib.warnings import RelaxWarning
 
 

Modified: trunk/pipe_control/structure/internal.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/structure/internal.py?rev=19125&r1=19124&r2=19125&view=diff
==============================================================================
--- trunk/pipe_control/structure/internal.py (original)
+++ trunk/pipe_control/structure/internal.py Sun Mar 24 17:29:08 2013
@@ -41,6 +41,7 @@
 from lib.io import file_root, open_read_file
 from lib.structure import pdb_read, pdb_write
 from lib.structure.internal.models import ModelList
+from lib.structure.internal.molecules import MolContainer
 from lib.warnings import RelaxWarning