r17619 - in /trunk/data: __init__.py diff_tensor.py exp_info.py gui.py interatomic.py mol_res_spin.py -- September 28, 2012 - 19:13

Author: bugman
Date: Fri Sep 28 19:13:09 2012
New Revision: 17619

URL: http://svn.gna.org/viewcvs/relax?rev=17619&view=rev
Log:
Python 3 preparations - the data package now really does use the absolute 
path for its module imports.


Modified:
    trunk/data/__init__.py
    trunk/data/diff_tensor.py
    trunk/data/exp_info.py
    trunk/data/gui.py
    trunk/data/interatomic.py
    trunk/data/mol_res_spin.py

Modified: trunk/data/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/__init__.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/__init__.py (original)
+++ trunk/data/__init__.py Fri Sep 28 19:13:09 2012
@@ -34,11 +34,11 @@
 import xml.dom.minidom
 
 # relax module imports.
+from data.gui import Gui
 from data.pipe_container import PipeContainer
+from data.relax_xml import fill_object_contents, xml_to_object
 import generic_fns
-from gui import Gui
 from relax_errors import RelaxError, RelaxPipeError, RelaxNoPipeError
-from relax_xml import fill_object_contents, xml_to_object
 from status import Status; status = Status()
 import version
 

Modified: trunk/data/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/diff_tensor.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/diff_tensor.py (original)
+++ trunk/data/diff_tensor.py Fri Sep 28 19:13:09 2012
@@ -26,12 +26,11 @@
 from numpy import array, float64, dot, identity, transpose, zeros
 
 # relax module imports.
-from data_classes import Element
+from data.data_classes import Element
+from data.relax_xml import fill_object_contents, xml_to_object
 from maths_fns.coord_transform import spherical_to_cartesian
 from maths_fns.rotation_matrix import two_vect_to_R
 from relax_errors import RelaxError
-from relax_xml import fill_object_contents, xml_to_object
-
 
 
 def calc_Diso(tm):

Modified: trunk/data/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/exp_info.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/exp_info.py (original)
+++ trunk/data/exp_info.py Fri Sep 28 19:13:09 2012
@@ -23,7 +23,7 @@
 """Module holding the experimental information data container."""
 
 # relax module imports.
-from data_classes import RelaxListType, Element
+from data.data_classes import RelaxListType, Element
 from relax_errors import RelaxError
 
 

Modified: trunk/data/gui.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/gui.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/gui.py (original)
+++ trunk/data/gui.py Fri Sep 28 19:13:09 2012
@@ -23,8 +23,8 @@
 """Data store objects for holding all the GUI specific variables."""
 
 # relax module imports.
-from data_classes import Element, RelaxListType
-from relax_xml import xml_to_object
+from data.data_classes import Element, RelaxListType
+from data.relax_xml import xml_to_object
 
 
 class Gui(Element):

Modified: trunk/data/interatomic.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/interatomic.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/interatomic.py (original)
+++ trunk/data/interatomic.py Fri Sep 28 19:13:09 2012
@@ -27,9 +27,9 @@
 
 # relax module imports.
 import generic_fns
-from prototype import Prototype
+from data.prototype import Prototype
+from data.relax_xml import fill_object_contents, object_to_xml, xml_to_object
 from relax_errors import RelaxError, RelaxFromXMLNotEmptyError, 
RelaxImplementError
-from relax_xml import fill_object_contents, object_to_xml, xml_to_object
 import specific_fns
 
 

Modified: trunk/data/mol_res_spin.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data/mol_res_spin.py?rev=17619&r1=17618&r2=17619&view=diff
==============================================================================
--- trunk/data/mol_res_spin.py (original)
+++ trunk/data/mol_res_spin.py Fri Sep 28 19:13:09 2012
@@ -28,11 +28,11 @@
 from string import lower
 
 # relax module imports.
+from data.prototype import Prototype
+from data.relax_xml import fill_object_contents, object_to_xml, xml_to_object
 from float import floatAsByteArray
 import generic_fns
-from prototype import Prototype
 from relax_errors import RelaxError, RelaxFromXMLNotEmptyError, 
RelaxImplementError
-from relax_xml import fill_object_contents, object_to_xml, xml_to_object
 import specific_fns