r19068 - in /trunk: data_store/ data_store/control/ data_store/objects/ test_suite/unit_tests/_data_store/_control/ test_sui... -- March 23, 2013 - 18:00

Author: bugman
Date: Sat Mar 23 18:00:41 2013
New Revision: 19068

URL: http://svn.gna.org/viewcvs/relax?rev=19068&view=rev
Log:
Reverted revisions r19065, r19066 and r19067.

The command used was:
svn merge -r19067:19064 .

The idea of the data_store.control absorbing most of generic_fns is not so 
good!


Added:
    trunk/data_store/align_tensor.py
      - copied unchanged from r19064, trunk/data_store/align_tensor.py
    trunk/data_store/data_classes.py
      - copied unchanged from r19064, trunk/data_store/data_classes.py
    trunk/data_store/diff_tensor.py
      - copied unchanged from r19064, trunk/data_store/diff_tensor.py
    trunk/data_store/exp_info.py
      - copied unchanged from r19064, trunk/data_store/exp_info.py
    trunk/data_store/gui.py
      - copied unchanged from r19064, trunk/data_store/gui.py
    trunk/data_store/interatomic.py
      - copied unchanged from r19064, trunk/data_store/interatomic.py
    trunk/data_store/mol_res_spin.py
      - copied unchanged from r19064, trunk/data_store/mol_res_spin.py
    trunk/data_store/pipe_container.py
      - copied unchanged from r19064, trunk/data_store/pipe_container.py
    trunk/data_store/prototype.py
      - copied unchanged from r19064, trunk/data_store/prototype.py
Removed:
    trunk/data_store/control/
    trunk/data_store/objects/
    trunk/test_suite/unit_tests/_data_store/_control/
    trunk/test_suite/unit_tests/_data_store/_objects/
Modified:
    trunk/data_store/__init__.py

Modified: trunk/data_store/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data_store/__init__.py?rev=19068&r1=19067&r2=19068&view=diff
==============================================================================
--- trunk/data_store/__init__.py (original)
+++ trunk/data_store/__init__.py Sat Mar 23 18:00:41 2013
@@ -31,8 +31,8 @@
 
 # relax module imports.
 from compat import builtins
-from data_store.objects.gui import Gui
-from data_store.objects.pipe_container import PipeContainer
+from data_store.gui import Gui
+from data_store.pipe_container import PipeContainer
 from data_store.relax_xml import fill_object_contents, xml_to_object
 import generic_fns
 from lib.errors import RelaxError, RelaxPipeError, RelaxNoPipeError
@@ -40,8 +40,16 @@
 import version
 
 
-__all__ = [
-    'relax_xml'
+__all__ = [ 'align_tensor',
+            'data_classes',
+            'diff_tensor',
+            'exp_info',
+            'gui',
+            'interatomic',
+            'mol_res_spin',
+            'pipe_container',
+            'prototype',
+            'relax_xml'
 ]