r6413 - in /1.3: data/pipe_container.py generic_fns/xml_data_pipe.py -- June 22, 2008 - 16:48

Author: bugman
Date: Sun Jun 22 16:48:07 2008
New Revision: 6413

URL: http://svn.gna.org/viewcvs/relax?rev=6413&view=rev
Log:
Shifted the xml import statements.


Modified:
    1.3/data/pipe_container.py
    1.3/generic_fns/xml_data_pipe.py

Modified: 1.3/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=6413&r1=6412&r2=6413&view=diff
==============================================================================
--- 1.3/data/pipe_container.py (original)
+++ 1.3/data/pipe_container.py Sun Jun 22 16:48:07 2008
@@ -22,6 +22,8 @@
 
 # Python module imports.
 from re import match
+import xml.dom.ext
+import xml.dom.minidom
 
 # relax module imports.
 from data_classes import Element
@@ -138,9 +140,6 @@
         @type file:         file
         """
 
-        # The current data pipe.
-        cdp = ds[ds.current_pipe]
-
         # Create the XML document object.
         xmldoc = xml.dom.minidom.Document()
 
@@ -154,7 +153,7 @@
         global_elem = xmldoc.createElement('global')
         pipe_elem.appendChild(global_elem)
         global_elem.setAttribute('desc', 'Global data located in the top 
level of the data pipe')
-        fill_object_contents(xmldoc, global_elem, object=cdp, 
blacklist=['diff_tensor', 'hybrid_pipes', 'is_empty', 'mol', 'pipe_type', 
'structure'])
+        fill_object_contents(xmldoc, global_elem, object=self, 
blacklist=['diff_tensor', 'hybrid_pipes', 'is_empty', 'mol', 'pipe_type', 
'structure'])
 
         # Hybrid info.
         create_hybrid_elem(xmldoc, pipe_elem)
@@ -171,6 +170,6 @@
         xml.dom.ext.PrettyPrint(xmldoc, file)
 
         # Print out.
-        print ds[ds.current_pipe]
+        print self
         print "\n\nXML:"
         xml.dom.ext.PrettyPrint(xmldoc)

Modified: 1.3/generic_fns/xml_data_pipe.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/xml_data_pipe.py?rev=6413&r1=6412&r2=6413&view=diff
==============================================================================
--- 1.3/generic_fns/xml_data_pipe.py (original)
+++ 1.3/generic_fns/xml_data_pipe.py Sun Jun 22 16:48:07 2008
@@ -25,8 +25,6 @@
 
 # Python module imports.
 from re import search
-import xml.dom.ext
-import xml.dom.minidom
 
 # relax module imports.
 from data import Relax_data_store; ds = Relax_data_store()