r6532 - /1.3/data/pipe_container.py -- June 28, 2008 - 22:43

Author: bugman
Date: Sat Jun 28 22:29:32 2008
New Revision: 6532

URL: http://svn.gna.org/viewcvs/relax?rev=6532&view=rev
Log:
Added a test to xml_read_element() to check if the pipe is empty.


Modified:
    1.3/data/pipe_container.py

Modified: 1.3/data/pipe_container.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/data/pipe_container.py?rev=6532&r1=6531&r2=6532&view=diff
==============================================================================
--- 1.3/data/pipe_container.py (original)
+++ 1.3/data/pipe_container.py Sat Jun 28 22:29:32 2008
@@ -1,6 +1,6 @@
 
###############################################################################
 #                                                                            
 #
-# Copyright (C) 2007 Edward d'Auvergne                                       
 #
+# Copyright (C) 2007-2008 Edward d'Auvergne                                  
 #
 #                                                                            
 #
 # This file is part of the program relax.                                    
 #
 #                                                                            
 #
@@ -29,6 +29,7 @@
 import generic_fns
 from mol_res_spin import MoleculeList
 from prototype import Prototype
+from relax_errors import RelaxFromXMLNotEmptyError
 from relax_xml import fill_object_contents, node_value_to_python, 
xml_to_object
 
 
@@ -216,6 +217,10 @@
         @type relax_node:   xml.dom.minidom.Element instance
         """
 
+        # Test if empty.
+        if not self.is_empty():
+            raise RelaxFromXMLNotEmptyError, self.__class__.__name__
+
         # Get the global data node, and fill the contents of the pipe.
         global_node = relax_node.getElementsByTagName('global')[0]
         xml_to_object(global_node, self)